Relocate some NanoBSD functions to a central place. Change NanoBSD diagnostics and system info widget to use the new code. Ticket #533 and some prerequisite parts of Ticket #534.

3 files changed, 140 insertions, 100 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index b21ec6f..6364d37 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1914,5 +1914,119 @@ function process_alias_urltable($name, $url, $freq, $forceupdate=false) {
 		return -1;
 	}
 }
+function get_real_slice_from_glabel($label) {
+	$label = escapeshellarg($label);
+	return trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/{$label} | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' '`);
+}
+function nanobsd_get_boot_slice() {
+	return trim(`/sbin/mount | /usr/bin/grep pfsense | /usr/bin/cut -d'/' -f4 | /usr/bin/cut -d' ' -f1`);
+}
+function nanobsd_get_boot_drive() {
+	return trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/pfsense | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' ' | /usr/bin/cut -d's' -f1`);
+}
+function nanobsd_get_active_slice() {
+	$boot_drive = nanobsd_get_boot_drive();
+	$active = trim(`gpart show $boot_drive | grep '\[active\]' | awk '{print $3;}'`);
+
+	return "{$boot_drive}s{$active}";
+}
+function nanobsd_get_size() {
+	return strtoupper(file_get_contents("/etc/nanosize.txt"));
+}
+function nanobsd_set_boot_slice($slice) {
+	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
+	global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
+	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
+	nanobsd_detect_slice_info();
+
+	for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); }
+	ob_implicit_flush(1);
+	if(strstr($slice, "s2")) {
+		$ASLICE="2";
+		$AOLDSLICE="1";
+		$AGLABEL_SLICE="pfsense1";
+		$AUFS_ID="1";
+		$AOLD_UFS_ID="0";
+	} else {
+		$ASLICE="1";
+		$AOLDSLICE="2";
+		$AGLABEL_SLICE="pfsense0";
+		$AUFS_ID="0";
+		$AOLD_UFS_ID="1";
+	}
+	$ATOFLASH="{$BOOT_DRIVE}s{$ASLICE}";
+	$ACOMPLETE_PATH="{$BOOT_DRIVE}s{$ASLICE}a";
+	$ABOOTFLASH="{$BOOT_DRIVE}s{$AOLDSLICE}";
+	conf_mount_rw();
+	exec("sysctl kern.geom.debugflags=16");
+	exec("gpart set -a active -i {$ASLICE} {$BOOT_DRIVE}");
+	exec("/usr/sbin/boot0cfg -s {$ASLICE} -v /dev/{$BOOT_DRIVE}");
+	exec("/sbin/tunefs -L ${AGLABEL_SLICE} /dev/$ACOMPLETE_PATH");
+	exec("/bin/mkdir /tmp/{$AGLABEL_SLICE}");
+	exec("/sbin/fsck_ufs -y /dev/{$ACOMPLETE_PATH}");
+	exec("/sbin/mount /dev/ufs/{$AGLABEL_SLICE} /tmp/{$AGLABEL_SLICE}");
+	$fstab = <<<EOF
+/dev/ufs/{$AGLABEL_SLICE} / ufs ro 1 1
+/dev/ufs/cf /cf ufs ro 1 1
+EOF;
+	file_put_contents("/tmp/{$AGLABEL_SLICE}/etc/fstab", $fstab);
+	exec("/sbin/umount /tmp/{$AGLABEL_SLICE}");
+	exec("/sbin/sysctl kern.geom.debugflags=0");
+	conf_mount_ro();
+}
+function nanobsd_clone_slice($dstslice) {
+	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
+	global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
+	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
+	nanobsd_detect_slice_info();
+
+	for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); }
+	ob_implicit_flush(1);
+	exec("/sbin/sysctl kern.geom.debugflags=16");
+	exec("/bin/dd if=/dev/zero of=/dev/{$TOFLASH} bs=1m count=1");
+	exec("/bin/dd if=/dev/{$BOOTFLASH} of=/dev/{$TOFLASH} bs=64k");
+	exec("/sbin/tunefs -L {$GLABEL_SLICE} /dev/{$COMPLETE_PATH}");
+	exec("/bin/mkdir /tmp/{$GLABEL_SLICE}");
+	exec("/sbin/fsck_ufs -y /dev/{$COMPLETE_PATH}");
+	exec("/sbin/mount /dev/ufs/{$GLABEL_SLICE} /tmp/{$GLABEL_SLICE}");
+	exec("/bin/cp /etc/fstab /tmp/{$GLABEL_SLICE}/etc/fstab");
+	$status = exec("sed -i \"\" \"s/pfsense{$OLD_UFS_ID}/pfsense{$UFS_ID}/g\" /tmp/{$GLABEL_SLICE}/etc/fstab");
+	exec("/sbin/umount /tmp/{$GLABEL_SLICE}");
+	exec("/sbin/sysctl kern.geom.debugflags=0");
+	if($status) {
+		return false;
+	} else {
+		return true;
+	}
+}
+function nanobsd_detect_slice_info() {
+	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
+	global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
+	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
+
+	$BOOT_DEVICE=nanobsd_get_boot_slice();
+	$REAL_BOOT_DEVICE=get_real_slice_from_glabel($BOOT_DEVICE);
+	$BOOT_DRIVE=nanobsd_get_boot_drive();
+	$ACTIVE_SLICE=nanobsd_get_active_slice();
+
+	// Detect which slice is active and set information.
+	if(strstr($REAL_BOOT_DEVICE, "s1")) {
+		$SLICE="2";
+		$OLDSLICE="1";
+		$GLABEL_SLICE="pfsense1";
+		$UFS_ID="1";
+		$OLD_UFS_ID="0";
 
+	} else {
+		$SLICE="1";
+		$OLDSLICE="2";
+		$GLABEL_SLICE="pfsense0";
+		$UFS_ID="0";
+		$OLD_UFS_ID="1";
+	}
+	$TOFLASH="{$BOOT_DRIVE}s{$SLICE}";
+	$COMPLETE_PATH="{$BOOT_DRIVE}s{$SLICE}a";
+	$COMPLETE_BOOT_PATH="{$BOOT_DRIVE}s{$OLDSLICE}";
+	$BOOTFLASH="{$BOOT_DRIVE}s{$OLDSLICE}";
+}
 ?>
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php
index 307b66e..fee325e 100755
--- a/usr/local/www/diag_nanobsd.php
+++ b/usr/local/www/diag_nanobsd.php
@@ -49,42 +49,11 @@ require_once("config.inc");
 $pgtitle = array("Diagnostics","NanoBSD");
 include("head.inc");
 
-function detect_slice_info() {
-	global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
-	global $GLABEL_SLIZE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
-	global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE;
-
-	$BOOT_DEVICE=trim(`/sbin/mount | /usr/bin/grep pfsense | /usr/bin/cut -d'/' -f4 | /usr/bin/cut -d' ' -f1`);
-	$REAL_BOOT_DEVICE=trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/{$BOOT_DEVICE} | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' '`);
-	$BOOT_DRIVE=trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/pfsense | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' ' | /usr/bin/cut -d's' -f1`);
-
-	// Detect which slice is active and set information.
-	if(strstr($REAL_BOOT_DEVICE, "s1")) {
-		$SLICE="2";
-		$OLDSLICE="1";
-		$TOFLASH="{$BOOT_DRIVE}s{$SLICE}";
-		$COMPLETE_PATH="{$BOOT_DRIVE}s{$SLICE}a";
-		$COMPLETE_BOOT_PATH="{$BOOT_DRIVE}s{$OLDSLICE}";	
-		$GLABEL_SLICE="pfsense1";
-		$UFS_ID="1";
-		$OLD_UFS_ID="0";
-		$BOOTFLASH="{$BOOT_DRIVE}s{$OLDSLICE}";
-
-	} else {
-		$SLICE="1";
-		$OLDSLICE="2";
-		$TOFLASH="{$BOOT_DRIVE}s{$SLICE}";
-		$COMPLETE_PATH="{$BOOT_DRIVE}s{$SLICE}a";
-		$COMPLETE_BOOT_PATH="{$BOOT_DRIVE}s{$OLDSLICE}";
-		$GLABEL_SLICE="pfsense0";
-		$UFS_ID="0";
-		$OLD_UFS_ID="1";
-		$BOOTFLASH="{$BOOT_DRIVE}s{$OLDSLICE}";
-	}
-}
-
 // Survey slice info
-detect_slice_info();
+global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
+global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
+global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
+nanobsd_detect_slice_info();
 
 ?>
 
@@ -95,7 +64,7 @@ detect_slice_info();
 
 <?php
 
-$NANOBSD_SIZE = strtoupper(file_get_contents("/etc/nanosize.txt"));
+$NANOBSD_SIZE = nanobsd_get_size();
 
 if($_POST['bootslice']) {
 	echo <<<EOF
@@ -105,51 +74,14 @@ if($_POST['bootslice']) {
 			<p/>&nbsp;
 		</div>
 EOF;
-	for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); }
-	ob_implicit_flush(1);
-	if(strstr($_POST['bootslice'], "s2")) {
-		$ASLICE="2";
-		$AOLDSLICE="1";
-		$ATOFLASH="{$BOOT_DRIVE}s{$ASLICE}";
-		$ACOMPLETE_PATH="{$BOOT_DRIVE}s{$ASLICE}a";
-		$AGLABEL_SLICE="pfsense1";
-		$AUFS_ID="1";
-		$AOLD_UFS_ID="0";
-		$ABOOTFLASH="{$BOOT_DRIVE}s{$AOLDSLICE}";
-	} else {
-		$ASLICE="1";
-		$AOLDSLICE="2";
-		$ATOFLASH="{$BOOT_DRIVE}s{$ASLICE}";
-		$ACOMPLETE_PATH="{$BOOT_DRIVE}s{$ASLICE}a";
-		$AGLABEL_SLICE="pfsense0";
-		$AUFS_ID="0";
-		$AOLD_UFS_ID="1";
-		$ABOOTFLASH="{$BOOT_DRIVE}s{$AOLDSLICE}";
-	}
-	conf_mount_rw();
-	exec("sysctl kern.geom.debugflags=16");	
-	exec("gpart set -a active -i {$ASLICE} {$BOOT_DRIVE}");
-	exec("/usr/sbin/boot0cfg -s {$ASLICE} -v /dev/{$BOOT_DRIVE}");
-	exec("/sbin/tunefs -L ${AGLABEL_SLICE} /dev/$ACOMPLETE_PATH");
-	exec("/bin/mkdir /tmp/{$AGLABEL_SLICE}");
-	exec("/sbin/fsck_ufs -y /dev/{$ACOMPLETE_PATH}");
-	exec("/sbin/mount /dev/ufs/{$AGLABEL_SLICE} /tmp/{$AGLABEL_SLICE}");
-	$fstab = <<<EOF
-/dev/ufs/{$AGLABEL_SLICE} / ufs ro 1 1
-/dev/ufs/cf /cf ufs ro 1 1	
-EOF;
-	file_put_contents("/tmp/{$AGLABEL_SLICE}/etc/fstab", $fstab);
-	exec("/sbin/umount /tmp/{$AGLABEL_SLICE}");
-	exec("/sbin/sysctl kern.geom.debugflags=0");
-	conf_mount_ro();
-	$savemsg = "The boot slice has been set to {$BOOT_DRIVE} {$AGLABEL_SLICE}";
+	nanobsd_set_boot_slice($_POST['bootslice']);
+	$savemsg = "The boot slice has been set to " . nanobsd_get_active_slice();
 	// Survey slice info
-	detect_slice_info();
+	nanobsd_detect_slice_info();
 
 }
 
 if($_POST['destslice']) {
-
 echo <<<EOF
  	<div id="loading">
 		<img src="/themes/metallic/images/misc/loader.gif">
@@ -157,27 +89,13 @@ echo <<<EOF
 		<p/>&nbsp;
 	</div>
 EOF;
-	for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); }
-	ob_implicit_flush(1);
-	exec("/sbin/sysctl kern.geom.debugflags=16");
-	exec("/bin/dd if=/dev/zero of=/dev/{$TOFLASH} bs=1m count=1");
-	exec("/bin/dd if=/dev/{$BOOTFLASH} of=/dev/{$TOFLASH} bs=64k");
-	exec("/sbin/tunefs -L {$GLABEL_SLICE} /dev/{$COMPLETE_PATH}");
-	exec("/bin/mkdir /tmp/{$GLABEL_SLICE}");
-	exec("/sbin/fsck_ufs -y /dev/{$COMPLETE_PATH}");
-	exec("/sbin/mount /dev/ufs/{$GLABEL_SLICE} /tmp/{$GLABEL_SLICE}");
-	exec("/bin/cp /etc/fstab /tmp/{$GLABEL_SLICE}/etc/fstab");
-	$status = exec("sed -i \"\" \"s/pfsense{$OLD_UFS_ID}/pfsense{$UFS_ID}/g\" /tmp/{$GLABEL_SLICE}/etc/fstab");
-	if($status) {
-		exec("/sbin/umount /tmp/{$GLABEL_SLICE}");
-		$savemsg = "There was an error while duplicating the slice.  Operation aborted.";
-	} else {
+	if(nanobsd_clone_slice($_POST['destslice'])) {
 		$savemsg = "The slice has been duplicated.<p/>If you would like to boot from this newly duplicated slice please set it using the bootup information area.";
-		exec("/sbin/umount /tmp/{$GLABEL_SLICE}");
+	} else {
+		$savemsg = "There was an error while duplicating the slice.  Operation aborted.";
 	}
-	exec("/sbin/sysctl kern.geom.debugflags=0");
 	// Re-Survey slice info
-	detect_slice_info();
+	nanobsd_detect_slice_info();
 }
 
 if ($savemsg)
@@ -217,11 +135,11 @@ if ($savemsg)
 							<form action="diag_nanobsd.php" method="post" name="iform">
 								Bootup slice:
 								<select name='bootslice'>
-									<option value='<?php echo $BOOTFLASH; ?>'>
+									<option value='<?php echo $BOOTFLASH; ?>'<?php if ($BOOTFLASH == $ACTIVE_SLICE) {?> selected<?php } ?>>
 										<?php echo $BOOTFLASH; ?>
 									</option>
-									<option value='<?php echo $TOFLASH; ?>'>
-										<?php echo "{$TOFLASH}"; ?>
+									<option value='<?php echo $TOFLASH; ?>'<?php if ($TOFLASH == $ACTIVE_SLICE) {?> selected<?php } ?>>
+										<?php echo $TOFLASH; ?>
 									</option>
 								</select>
 								<br/>
diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php
index 9e58f1b..c9a6b65 100644
--- a/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/usr/local/www/widgets/widgets/system_information.widget.php
@@ -95,12 +95,20 @@ $curcfg = $config['system']['firmware'];
 		<?php endif; ?>
 		<?php if ($g['platform'] == "nanobsd"): ?>
 			<?
-			$BOOT_DEVICE=trim(`/sbin/mount | /usr/bin/grep pfsense | /usr/bin/cut -d'/' -f4 | /usr/bin/cut -d' ' -f1`);
-			$REAL_BOOT_DEVICE=trim(`/sbin/glabel list | /usr/bin/grep -B2 ufs/{$BOOT_DEVICE} | /usr/bin/head -n 1 | /usr/bin/cut -f3 -d' '`);
+			global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;
+			global $GLABEL_SLICE, $UFS_ID, $OLD_UFS_ID, $BOOTFLASH;
+			global $BOOT_DEVICE, $REAL_BOOT_DEVICE, $BOOT_DRIVE, $ACTIVE_SLICE;
+			nanobsd_detect_slice_info();
 			?>
 		<tr>
 			<td width="25%" class="vncellt">NanoBSD Boot Slice</td>
-			<td width="75%" class="listr"><?=htmlspecialchars($BOOT_DEVICE);?> / <?=htmlspecialchars($REAL_BOOT_DEVICE);?></td>
+			<td width="75%" class="listr">
+				<?=htmlspecialchars($BOOT_DEVICE);?> / <?=htmlspecialchars($BOOTFLASH);?>
+				<?php if ($BOOTFLASH != $ACTIVE_SLICE): ?>
+				<br/><br/>Next Boot:<br/>
+				<?=htmlspecialchars($GLABEL_SLICE);?> / <?=htmlspecialchars($ACTIVE_SLICE);?>
+				<?php endif; ?>
+			</td>
 		</tr>
 		<?php endif; ?>
 		<tr>