diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-06-17 01:07:31 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-06-17 01:07:31 +0000 |
| commit | b3191bd2fcebc70a5f60383a4aa722139f59bbcf (patch) | |
| tree | 6425e7b4f6c6b464fafd2f5e840c9ae53b1a0278 | |
| parent | 614d23110c8314f4dab8f96f6f12818c29f96784 (diff) | |
| download | pfsense-b3191bd2fcebc70a5f60383a4aa722139f59bbcf.zip pfsense-b3191bd2fcebc70a5f60383a4aa722139f59bbcf.tar.gz | |
Do not assume that we ship uniprocessor kernel on LiveCD any longer.
| -rwxr-xr-x | etc/rc.initial.firmware_update | 2 | ||||
| -rwxr-xr-x | tmp/post_upgrade_command | 5 |
2 files changed, 6 insertions, 1 deletions
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 |
