mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove other potential places where someone could select a kernel we no longer ship. Try to improve kernel detection a little more.

Browse Source
This commit is contained in:
jim-p 2012-11-20 09:32:25 -05:00
parent c0f613e298
commit bff167fd35
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/rc.initial.firmware_update
View File

@ -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";
}

10
tmp/post_upgrade_command
View File

@ -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

6
usr/local/www/system_firmware.php
View File

@ -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");