[PC-BSD Commits] r7782 - pcbsd-projects/txt-sysinstall

svn at pcbsd.org svn at pcbsd.org
Tue Oct 12 15:32:13 PDT 2010


Author: johnh
Date: 2010-10-12 15:32:13 -0700 (Tue, 12 Oct 2010)
New Revision: 7782

Added:
   pcbsd-projects/txt-sysinstall/system.c
Modified:
   pcbsd-projects/txt-sysinstall/Makefile
   pcbsd-projects/txt-sysinstall/components.c
   pcbsd-projects/txt-sysinstall/label.c
   pcbsd-projects/txt-sysinstall/mainmenu.c
   pcbsd-projects/txt-sysinstall/txt-sysinstall.h
Log:
Moved picking the OS out from components into it's own file and
introduce it much sooner in the installation process.


Modified: pcbsd-projects/txt-sysinstall/Makefile
===================================================================
--- pcbsd-projects/txt-sysinstall/Makefile	2010-10-12 21:04:39 UTC (rev 7781)
+++ pcbsd-projects/txt-sysinstall/Makefile	2010-10-12 22:32:13 UTC (rev 7782)
@@ -3,7 +3,7 @@
 PROG=	txt-sysinstall
 SRCS=	main.c mainmenu.c disksel.c partsel.c useradd.c netif.c rootpass.c
 SRCS+=	tzone.c components.c util.c install.c medium.c label.c ftp.c
-SRCS+=	packages.c
+SRCS+=	packages.c system.c
 
 CFLAGS+=	-ggdb -DDEBUG 
 

Modified: pcbsd-projects/txt-sysinstall/components.c
===================================================================
--- pcbsd-projects/txt-sysinstall/components.c	2010-10-12 21:04:39 UTC (rev 7781)
+++ pcbsd-projects/txt-sysinstall/components.c	2010-10-12 22:32:13 UTC (rev 7782)
@@ -43,18 +43,6 @@
 };
 
 static int
-type_fire(dialogMenuItem *self)
-{
-	installType(self->prompt);
-	if (!strcmp(self->prompt, "FreeBSD"))
-		packageType("split");
-	else
-		packageType("uzip");
-
-	return (0);
-}
-
-static int
 component_checked(dialogMenuItem *self)
 {
 	struct component *c = self->data;
@@ -99,14 +87,7 @@
 	i = 0;
 	DMENUF(&menus[i++], "Next", NULL, NULL);
 	DMENUF(&menus[i++], "Back", NULL, NULL);
-	DMENUF(&menus[i++], "PC-BSD", "", type_fire);
-	DMENUF(&menus[i++], "FreeBSD", "", type_fire);
 
-	screen_clear(MODULE);
-	dialog_menu(MODULE, "Please select the system to install:",
-	    9, 40, 2, -2, menus+2, "", NULL, NULL);
-
-	i = 2;
 	while ((token = strsep(&buf, "\n")) != NULL && safe_strlen(token) > 0 &&
 	    i < MAXCOMP) {
 		char *key, *value;

Modified: pcbsd-projects/txt-sysinstall/label.c
===================================================================
--- pcbsd-projects/txt-sysinstall/label.c	2010-10-12 21:04:39 UTC (rev 7781)
+++ pcbsd-projects/txt-sysinstall/label.c	2010-10-12 22:32:13 UTC (rev 7782)
@@ -96,8 +96,6 @@
 STAILQ_HEAD(zfs_mount_head, zfs_mount) zfs_mount_list = 
 	STAILQ_HEAD_INITIALIZER(zfs_mount_list);
 
-static dialogMenuItem *labels;
-
 static void
 add_label(const char *label, const char *desc, char *password, size_t size, long flags)
 {

Modified: pcbsd-projects/txt-sysinstall/mainmenu.c
===================================================================
--- pcbsd-projects/txt-sysinstall/mainmenu.c	2010-10-12 21:04:39 UTC (rev 7781)
+++ pcbsd-projects/txt-sysinstall/mainmenu.c	2010-10-12 22:32:13 UTC (rev 7782)
@@ -143,6 +143,7 @@
 sysinstall(void)
 {
 	dialog_sysinstall();
+	dialog_system();
 	dialog_partsel();
 	dialog_label();
 	dialog_useradd();

Modified: pcbsd-projects/txt-sysinstall/txt-sysinstall.h
===================================================================
--- pcbsd-projects/txt-sysinstall/txt-sysinstall.h	2010-10-12 21:04:39 UTC (rev 7781)
+++ pcbsd-projects/txt-sysinstall/txt-sysinstall.h	2010-10-12 22:32:13 UTC (rev 7782)
@@ -142,6 +142,7 @@
 int			dialog_label(void);
 int			dialog_ftp(void);
 int			dialog_packages(void);
+int			dialog_system(void);
 void		dialog_busy(int, int, const char *);
 void		do_install(void);
 



More information about the Commits mailing list