summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@G5.homeunix.net>2009-10-10 21:39:10 -0400
committerScott Ullrich <sullrich@G5.homeunix.net>2009-10-10 21:39:10 -0400
commit8ae39a39a944048d786e8eee16eb43cc10bf7be3 (patch)
treee6f08738a49ef866beec0d80cfcd9876f3ebcb4a
parentc43ed2f92df169a80b81feb85d80223e9710ac5b (diff)
downloadpfsense-8ae39a39a944048d786e8eee16eb43cc10bf7be3.zip
pfsense-8ae39a39a944048d786e8eee16eb43cc10bf7be3.tar.gz
Use /etc/nanosize.txt
-rw-r--r--usr/local/www/diag_nanobsd.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php
index 456869e..bb09fba 100644
--- a/usr/local/www/diag_nanobsd.php
+++ b/usr/local/www/diag_nanobsd.php
@@ -67,7 +67,6 @@ function detect_slice_info() {
$UFS_ID="1";
$OLD_UFS_ID="0";
$BOOTFLASH="{$BOOT_DRIVE}s{$OLDSLICE}";
-
} else {
$SLICE="1";
$OLDSLICE="2";
@@ -122,6 +121,9 @@ EOF;
$AOLD_UFS_ID="1";
$ABOOTFLASH="{$BOOT_DRIVE}s{$AOLDSLICE}";
}
+
+ $NANOBSD_SIZE = file_get_contents("/etc/nanosize.txt");
+
conf_mount_rw();
exec("sysctl kern.geom.debugflags=16");
exec("gpart set -a active -i {$ASLICE} {$BOOT_DRIVE}");
@@ -203,7 +205,7 @@ if ($savemsg)
<tr>
<td width="22%" valign="top" class="vncell">NanoBSD Image size</td>
<td width="78%" class="vtable">
- <?php echo format_bytes($NANOBSD_SIZE); ?>
+ <?php echo "$NANOBSD_SIZE"; ?>
</td>
</tr>
<tr>
OpenPOWER on IntegriCloud