diff options
| -rwxr-xr-x | etc/rc.initial.firmware_update | 14 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command | 10 | ||||
| -rwxr-xr-x | usr/local/www/system_firmware.php | 6 |
3 files changed, 13 insertions, 17 deletions
diff --git a/etc/rc.initial.firmware_update b/etc/rc.initial.firmware_update index c53b115..722a1f5 100755 --- a/etc/rc.initial.firmware_update +++ b/etc/rc.initial.firmware_update @@ -155,25 +155,17 @@ function check_for_kernel_file() { } if(!file_exists("/boot/kernel/pfsense_kernel.txt")) { echo "\nPlease select which kernel you would like to use:\n"; - echo "\n1. Non SMP kernel"; - echo "\n2. SMP kernel"; - echo "\n3. Embedded kernel (no video or keyboard)"; - echo "\n4. Developers kernel (slower performing, more debugging)\n"; + echo "\n1. Standard Kernel"; + echo "\n2. Embedded kernel (no video or keyboard)"; echo "\nPlease enter a number [1-4]: "; $selection = strtoupper(chop(fgets($fp))); switch ($selection) { case "1": - exec("echo UP > /boot/kernel/pfsense_kernel.txt"); - break; - case "2": exec("echo SMP > /boot/kernel/pfsense_kernel.txt"); break; - case "3": + case "2": exec("echo wrap > /boot/kernel/pfsense_kernel.txt"); break; - case "4": - exec("echo Developers > /boot/kernel/pfsense_kernel.txt"); - break; } echo "\n"; } diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index c432988..634afb0 100755 --- a/tmp/post_upgrade_command +++ b/tmp/post_upgrade_command @@ -3,7 +3,13 @@ /etc/rc.conf_mount_rw PFSENSETYPE=`cat /etc/platform` -OLDKERNEL=`cat /boot/kernel/pfsense_kernel.txt` + +# check in two places for the old kernel type, since it could have been moved elsewhere in the upgrade process. +if [ -f /boot/kernel/pfsense_kernel.txt ]; then + OLDKERNEL=`cat /boot/kernel/pfsense_kernel.txt` +else + OLDKERNEL=`cat /tmp/pfsense_kernel.txt` +fi # Massage the existing kernel into one that actually exists. # Leaving old entries so we can bring back other kernels later if desired. @@ -32,7 +38,7 @@ esac echo ${KERNELTYPE} > /boot/kernel/pfsense_kernel.txt HAVE_KERNEL=false -case "$KERNELTYPE" in +case "${KERNELTYPE}" in "wrap") if [ -f /kernels/kernel_wrap.gz ]; then HAVE_KERNEL=true diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 033266a..1a54d0d 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -52,10 +52,8 @@ require_once("guiconfig.inc"); $curcfg = $config['system']['firmware']; $kerneltypes = array( - 'SMP' => gettext("Multiprocessor kernel"), - 'single' => gettext("Uniprocessor kernel"), - 'wrap' => gettext("Embedded kernel"), - 'Developers' => gettext("Developers kernel") + 'SMP' => gettext("Standard Kernel"), + 'wrap' => gettext("Embedded Kernel"), ); require_once("xmlrpc_client.inc"); |
