diff options
author | jim-p <jim@pingle.org> | 2010-04-23 10:05:01 -0400 |
---|---|---|
committer | jim-p <jim@pingle.org> | 2010-04-23 10:05:01 -0400 |
commit | 08fd5444a92c40b9c248493b8da517ffce0e5445 (patch) | |
tree | c0d63ac4a5c3685884daed763df780627b6f8af4 /usr/local/www/widgets/widgets/system_information.widget.php | |
parent | 8ec7b3e06291a69d074d0e3b42314986c6b08a39 (diff) | |
download | pfsense-08fd5444a92c40b9c248493b8da517ffce0e5445.zip pfsense-08fd5444a92c40b9c248493b8da517ffce0e5445.tar.gz |
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.
Diffstat (limited to 'usr/local/www/widgets/widgets/system_information.widget.php')
-rw-r--r-- | usr/local/www/widgets/widgets/system_information.widget.php | 14 |
1 files changed, 11 insertions, 3 deletions
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> |