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

[svn at pcbsd.org]

Author: johnh
Date: 2010-08-20 19:16:33 -0700 (Fri, 20 Aug 2010)
New Revision: 7416

Modified:
   pcbsd-projects/txt-sysinstall/components.c
   pcbsd-projects/txt-sysinstall/install.c
   pcbsd-projects/txt-sysinstall/label.c
   pcbsd-projects/txt-sysinstall/medium.c
   pcbsd-projects/txt-sysinstall/packages.c
   pcbsd-projects/txt-sysinstall/util.c
Log:
A couple of bugfixes.


Modified: pcbsd-projects/txt-sysinstall/components.c
===================================================================
--- pcbsd-projects/txt-sysinstall/components.c	2010-08-21 00:08:09 UTC (rev 7415)
+++ pcbsd-projects/txt-sysinstall/components.c	2010-08-21 02:16:33 UTC (rev 7416)
@@ -157,7 +157,6 @@
 	free(compstr);
 	free(menus);
 
-	save_config();
-	do_install();
+	set_next_dialog("packages", &dialog_packages, NULL, NULL);
 	return (0);
 }

Modified: pcbsd-projects/txt-sysinstall/install.c
===================================================================
--- pcbsd-projects/txt-sysinstall/install.c	2010-08-21 00:08:09 UTC (rev 7415)
+++ pcbsd-projects/txt-sysinstall/install.c	2010-08-21 02:16:33 UTC (rev 7416)
@@ -43,7 +43,8 @@
 static void
 show_progress(char *line)
 {
-		dialog_busy(5, 60, line);
+	dialog_busy(5, 60, line);
+
 #if 0
 	static int nfiles = 0, cfile = 0;
 	static char value[64];

Modified: pcbsd-projects/txt-sysinstall/label.c
===================================================================
--- pcbsd-projects/txt-sysinstall/label.c	2010-08-21 00:08:09 UTC (rev 7415)
+++ pcbsd-projects/txt-sysinstall/label.c	2010-08-21 02:16:33 UTC (rev 7416)
@@ -450,6 +450,17 @@
 	(*pptr)[strlen(*pptr) - 1] = 0;
 }
 
+static void
+free_zpool_disk_list(void)
+{
+	struct zpool_disk *zd, *temp;
+
+	STAILQ_FOREACH_SAFE(zd, &zpool_disk_list, entries, temp) {
+		STAILQ_REMOVE(&zpool_disk_list, zd, zpool_disk, entries);
+		free(zd);
+	}
+}
+
 static int
 zfs_fire(dialogMenuItem *self)
 {
@@ -528,7 +539,7 @@
 	if (self->aux != 0)
 		SET_FS_FLAGS(flags, self->aux);
 
-	add_label("SWAP", NULL, password, mb, flags);
+	add_label("none", NULL, password, mb, flags);
 	return (0);
 }
 
@@ -543,8 +554,8 @@
 
 	i = 0;
 	menus = safe_malloc(sizeof(*menus)*MAXTYPES+2);
-	DMENUF(&menus[i++], "Next", NULL, NULL);
-	DMENUF(&menus[i++], "Back", NULL, NULL);
+	DMENUF(&menus[i++], "OK", NULL, NULL);
+	DMENUF(&menus[i++], "Cancel", NULL, NULL);
 
 	data = 0;
 	DMENUFD(&menus[i++], "UFS", "UFS filesystem",
@@ -684,6 +695,9 @@
 			}
 		}
 	}
+
+	appendconfig("commitDiskLabel", NULL);
+	free_zpool_disk_list();
 }
 
 static int
@@ -701,6 +715,7 @@
 	return (0);
 }
 
+
 int
 dialog_label(void *args)
 {

Modified: pcbsd-projects/txt-sysinstall/medium.c
===================================================================
--- pcbsd-projects/txt-sysinstall/medium.c	2010-08-21 00:08:09 UTC (rev 7415)
+++ pcbsd-projects/txt-sysinstall/medium.c	2010-08-21 02:16:33 UTC (rev 7416)
@@ -82,6 +82,6 @@
 	dialog_menu(MODULE, "Please select the install medium:",
 	    7+i-2, 70, i-2, -i+2, menus+2, "", NULL, NULL);
 
-	set_next_dialog("packages", &PKGFUNC, NULL, NULL);
+	set_next_dialog("components", &dialog_components, NULL, NULL);
 	return (0);
 }

Modified: pcbsd-projects/txt-sysinstall/packages.c
===================================================================
--- pcbsd-projects/txt-sysinstall/packages.c	2010-08-21 00:08:09 UTC (rev 7415)
+++ pcbsd-projects/txt-sysinstall/packages.c	2010-08-21 02:16:33 UTC (rev 7416)
@@ -218,8 +218,8 @@
 		menus = safe_malloc(sizeof(*menus)*pch->size+2);
 
 		i = 0;
-		DMENUF(&menus[i++], "Next", NULL, NULL);
-		DMENUF(&menus[i++], "Back", NULL, NULL);
+		DMENUF(&menus[i++], "OK", NULL, NULL);
+		DMENUF(&menus[i++], "Cancel", NULL, NULL);
 
 		STAILQ_FOREACH(pi, &pch->packagelist, entries) {
 			DMENU(&menus[i], pi->package, "", package_checked,
@@ -249,8 +249,8 @@
 	menus = safe_malloc(sizeof(*menus)*categorylist_size+2);
 
 	i = 0;
-	DMENUF(&menus[i++], "Next", NULL, NULL);
-	DMENUF(&menus[i++], "Back", NULL, NULL);
+	DMENUF(&menus[i++], "OK", NULL, NULL);
+	DMENUF(&menus[i++], "Cancel", NULL, NULL);
 
 	STAILQ_FOREACH(temp, &categorylist, entries) {
 		DMENUF(&menus[i++], temp->category, "", category_fire);

Modified: pcbsd-projects/txt-sysinstall/util.c
===================================================================
--- pcbsd-projects/txt-sysinstall/util.c	2010-08-21 00:08:09 UTC (rev 7415)
+++ pcbsd-projects/txt-sysinstall/util.c	2010-08-21 02:16:33 UTC (rev 7416)
@@ -319,7 +319,6 @@
 	return (ptr);
 }
 
-
 void
 free_disk_list(void)
 {