Module Name: src
Committed By: martin
Date: Wed Dec 11 15:08:45 UTC 2019
Modified Files:
src/usr.sbin/sysinst: defs.h main.c
src/usr.sbin/sysinst/arch/evbarm: md.c menus.md.en menus.md.es
menus.md.fr menus.md.pl
Log Message:
Get rid of the evbarm preliminary menu: do not bother to ask the user
whether this is a RPi - query the FDT instead.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sysinst/main.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbarm/menus.md.en \
src/usr.sbin/sysinst/arch/evbarm/menus.md.es \
src/usr.sbin/sysinst/arch/evbarm/menus.md.fr \
src/usr.sbin/sysinst/arch/evbarm/menus.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.48 src/usr.sbin/sysinst/defs.h:1.49
--- src/usr.sbin/sysinst/defs.h:1.48 Thu Nov 14 13:58:22 2019
+++ src/usr.sbin/sysinst/defs.h Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.48 2019/11/14 13:58:22 martin Exp $ */
+/* $NetBSD: defs.h,v 1.49 2019/12/11 15:08:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -583,7 +583,6 @@ void remove_gpt_options(void);
/* Machine dependent functions .... */
void md_init(void);
-void md_prelim_menu(void);
void md_init_set_status(int); /* SFLAG_foo */
/* MD functions if user selects install - in order called */
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.18 src/usr.sbin/sysinst/main.c:1.19
--- src/usr.sbin/sysinst/main.c:1.18 Tue Nov 12 16:33:14 2019
+++ src/usr.sbin/sysinst/main.c Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.18 2019/11/12 16:33:14 martin Exp $ */
+/* $NetBSD: main.c,v 1.19 2019/12/11 15:08:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -164,9 +164,6 @@ init_lang(void)
multname = msg_string(MSG_secname);
}
-__weakref_visible void prelim_menu(void)
- __weak_reference(md_prelim_menu);
-
int
main(int argc, char **argv)
{
@@ -264,12 +261,6 @@ main(int argc, char **argv)
get_kb_encoding();
init_lang();
-#ifdef __weak_reference
- /* if md wants to ask anything before we start, do it now */
- if (prelim_menu != 0)
- prelim_menu();
-#endif
-
/* Menu processing */
if (partman_go)
partman();
Index: src/usr.sbin/sysinst/arch/evbarm/md.c
diff -u src/usr.sbin/sysinst/arch/evbarm/md.c:1.9 src/usr.sbin/sysinst/arch/evbarm/md.c:1.10
--- src/usr.sbin/sysinst/arch/evbarm/md.c:1.9 Wed Aug 14 12:55:36 2019
+++ src/usr.sbin/sysinst/arch/evbarm/md.c Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.9 2019/08/14 12:55:36 martin Exp $ */
+/* $NetBSD: md.c,v 1.10 2019/12/11 15:08:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -48,18 +48,20 @@
#include "msg_defs.h"
#include "menu_defs.h"
-int boardtype = 0;
-
-void
-md_prelim_menu(void)
-{
- /* get the boardtype from the user */
- process_menu(MENU_prelim, NULL);
-}
+int boardtype = BOARD_TYPE_NORMAL;
void
md_init(void)
{
+ int rv;
+
+ rv =run_program(RUN_SILENT|RUN_ERROR_OK, "sh -c 'ofctl -p / model | "
+ "fgrep \"Raspberry Pi\"'");
+ if (rv != 0)
+ return;
+
+ /* this is some kind of Raspberry Pi */
+ boardtype = BOARD_TYPE_RPI;
}
void
Index: src/usr.sbin/sysinst/arch/evbarm/menus.md.en
diff -u src/usr.sbin/sysinst/arch/evbarm/menus.md.en:1.1 src/usr.sbin/sysinst/arch/evbarm/menus.md.en:1.2
--- src/usr.sbin/sysinst/arch/evbarm/menus.md.en:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/menus.md.en Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.en,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: menus.md.en,v 1.2 2019/12/11 15:08:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,3 @@
/* evbarm machine dependent menus, english */
-menu prelim, title "What kind of system do you have?", y=-10;
- option "Raspberry PI", exit, action { boardtype = 1; };
- option "Other", exit, action { boardtype = 0; };
-
Index: src/usr.sbin/sysinst/arch/evbarm/menus.md.es
diff -u src/usr.sbin/sysinst/arch/evbarm/menus.md.es:1.1 src/usr.sbin/sysinst/arch/evbarm/menus.md.es:1.2
--- src/usr.sbin/sysinst/arch/evbarm/menus.md.es:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/menus.md.es Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.es,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: menus.md.es,v 1.2 2019/12/11 15:08:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,3 @@
/* evbarm machine dependent menus, spanish */
-menu prelim, title "What kind of system do you have?", y=-10;
- option "Raspberry PI", exit, action { boardtype = 1; };
- option "Other", exit, action { boardtype = 0; };
-
Index: src/usr.sbin/sysinst/arch/evbarm/menus.md.fr
diff -u src/usr.sbin/sysinst/arch/evbarm/menus.md.fr:1.1 src/usr.sbin/sysinst/arch/evbarm/menus.md.fr:1.2
--- src/usr.sbin/sysinst/arch/evbarm/menus.md.fr:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/menus.md.fr Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.fr,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: menus.md.fr,v 1.2 2019/12/11 15:08:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -35,7 +35,3 @@
/* evbarm machine dependent menus, french */
-menu prelim, title "What kind of system do you have?", y=-10;
- option "Raspberry PI", exit, action { boardtype = 1; };
- option "Other", exit, action { boardtype = 0; };
-
Index: src/usr.sbin/sysinst/arch/evbarm/menus.md.pl
diff -u src/usr.sbin/sysinst/arch/evbarm/menus.md.pl:1.1 src/usr.sbin/sysinst/arch/evbarm/menus.md.pl:1.2
--- src/usr.sbin/sysinst/arch/evbarm/menus.md.pl:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/menus.md.pl Wed Dec 11 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.md.pl,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: menus.md.pl,v 1.2 2019/12/11 15:08:45 martin Exp $ */
/* Based on english version: */
/* NetBSD: menus.md.en,v 1.2 2002/03/31 02:14:06 thorpej Exp */
@@ -37,7 +37,3 @@
/* evbarm machine dependent menus, Polish */
-menu prelim, title "What kind of system do you have?", y=-10;
- option "Raspberry PI", exit, action { boardtype = 1; };
- option "Other", exit, action { boardtype = 0; };
-
