summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-04-14 08:13:37 +0000
committerErmal <eri@pfsense.org>2014-04-14 08:13:37 +0000
commit23cb5252d7d6fe04675a4e450ac1d0effff11446 (patch)
treebc81b1e623408725a5f4417e252a0067f868e65a
parentf03ed3505dbd11cf0196b87fe9234b1c3d858fd4 (diff)
downloadpfsense-23cb5252d7d6fe04675a4e450ac1d0effff11446.zip
pfsense-23cb5252d7d6fe04675a4e450ac1d0effff11446.tar.gz
There is no need to make distinction in kernel anymore since they are the same nowdays and it does the right thing(tm) most of the time
-rwxr-xr-xtmp/post_upgrade_command85
-rw-r--r--tmp/pre_upgrade_command2
2 files changed, 0 insertions, 87 deletions
diff --git a/tmp/post_upgrade_command b/tmp/post_upgrade_command
index 5f96dc6..d5577f7 100755
--- a/tmp/post_upgrade_command
+++ b/tmp/post_upgrade_command
@@ -4,83 +4,6 @@
PFSENSETYPE=`cat /etc/platform`
-# 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.
-case "$OLDKERNEL" in
- "wrap")
- KERNELTYPE=wrap
- ;;
- "wrap_vga")
- KERNELTYPE=wrap_vga
- ;;
- "Developers")
- KERNELTYPE=SMP
- ;;
- "UP")
- KERNELTYPE=SMP
- ;;
- "SMP")
- KERNELTYPE=SMP
- ;;
- *)
- if [ "${PFSENSETYPE}" = "pfSense" ]; then
- KERNELTYPE=SMP
- elif [ "${PFSENSETYPE}" = "nanobsd" ]; then
- KERNELTYPE=WRAP
- fi
- ;;
-esac
-
-# Overwrite the old kernel type with what we're using now to reflect what is about to be written out.
-echo ${KERNELTYPE} > /boot/kernel/pfsense_kernel.txt
-HAVE_KERNEL=false
-
-case "${KERNELTYPE}" in
- "wrap")
- if [ -f /kernels/kernel_wrap.gz ]; then
- HAVE_KERNEL=true
- tar xzpf /kernels/kernel_wrap.gz --exclude loader.conf -C /boot/
- cp /etc/ttys_wrap /etc/ttys
- fi
- ;;
- "wrap_vga")
- if [ -f /kernels/kernel_wrap_vga.gz ]; then
- HAVE_KERNEL=true
- tar xzpf /kernels/kernel_wrap_vga.gz --exclude loader.conf -C /boot/
- fi
- ;;
- "Developers")
- if [ -f /kernels/kernel_Dev.gz ]; then
- HAVE_KERNEL=true
- tar xzpf /kernels/kernel_Dev.gz --exclude loader.conf -C /boot/
- fi
- ;;
- "UP")
- if [ -f /kernels/kernel_uniprocessor.gz ]; then
- HAVE_KERNEL=true
- tar xzpf /kernels/kernel_uniprocessor.gz --exclude loader.conf -C /boot/
- fi
- ;;
- "SMP")
- if [ -f /kernels/kernel_SMP.gz ]; then
- HAVE_KERNEL=true
- tar xzpf /kernels/kernel_SMP.gz --exclude loader.conf -C /boot/
- fi
- ;;
-esac
-
-if [ ${HAVE_KERNEL} = "false" ]; then
- echo "ERROR: Unable to locate a kernel upgrade file!"
- sleep 5
-fi
-
if [ $PFSENSETYPE = "pfSense" ] || [ $PFSENSETYPE = "nanobsd" ]; then
touch /conf/needs_package_sync
fi
@@ -106,14 +29,6 @@ rm -f /root/*.md5
# File moved to pfSense php shell (pfSsh.php)
rm -rf /usr/local/sbin/cvs_sync.sh
-if [ $PFSENSETYPE = "embedded" ]; then
- cp /etc/ttys_wrap /etc/ttys
-fi
-
-if [ -f /usr/local/sbin/php ]; then
- rm /usr/local/sbin/php
-fi
-
# Fixup permissions on installed files
if [ "${PFSENSETYPE}" = "nanobsd" ]; then
MTREECHKDIR=/tmp/${1}/
diff --git a/tmp/pre_upgrade_command b/tmp/pre_upgrade_command
index 3eabc5f..c6bb66c 100644
--- a/tmp/pre_upgrade_command
+++ b/tmp/pre_upgrade_command
@@ -6,7 +6,5 @@
PRIOR_VERSION=`uname -r | cut -d'.' -f1`
echo $PRIOR_VERSION > /tmp/pre_upgrade_version
-mv /boot/kernel/pfsense_kernel.txt /tmp/pfsense_kernel.txt
rm /boot/kernel/*
-mv /tmp/pfsense_kernel.txt /boot/kernel/
OpenPOWER on IntegriCloud