From b3191bd2fcebc70a5f60383a4aa722139f59bbcf Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 17 Jun 2008 01:07:31 +0000 Subject: Do not assume that we ship uniprocessor kernel on LiveCD any longer. --- etc/rc.initial.firmware_update | 2 +- tmp/post_upgrade_command | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/etc/rc.initial.firmware_update b/etc/rc.initial.firmware_update index 5acfe40..77afa64 100755 --- a/etc/rc.initial.firmware_update +++ b/etc/rc.initial.firmware_update @@ -136,7 +136,7 @@ function check_for_kernel_file() { $selection = strtoupper(chop(fgets($fp))); switch ($selection) { case "1": - touch("/boot/kernel/pfsense_kernel.txt"); + exec("echo UP > /boot/kernel/pfsense_kernel.txt"); break; case "2": exec("echo SMP > /boot/kernel/pfsense_kernel.txt"); diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command index 8d2b12b..48b3f59 100755 --- a/tmp/post_upgrade_command +++ b/tmp/post_upgrade_command @@ -21,6 +21,11 @@ if [ $KERNELTYPE = "SMP" ]; then tar xzpf /kernels/kernel_SMP.gz -C /boot/ fi fi +if [ $KERNELTYPE = "UP" ]; then + if [ -f /kernels/kernel_SMP.gz ]; then + tar xzpf /kernels/kernel_uniprocessor.gz -C /boot/ + fi +fi # Now turn on or off serial console as needed php -f /tmp/post_upgrade_command.php -- cgit v1.1