]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
core-next: remove kernel-update from update.sh.
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 25 Aug 2011 09:24:49 +0000 (11:24 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 25 Aug 2011 09:24:49 +0000 (11:24 +0200)
config/rootfiles/core/next/filelists/crda [deleted symlink]
config/rootfiles/core/next/filelists/dracut [deleted symlink]
config/rootfiles/core/next/filelists/grub [deleted symlink]
config/rootfiles/core/next/filelists/iw [deleted symlink]
config/rootfiles/core/next/filelists/linux [deleted symlink]
config/rootfiles/core/next/filelists/linux-firmware [deleted symlink]
config/rootfiles/core/next/filelists/wireless-regdb [deleted symlink]
config/rootfiles/core/next/filelists/zd1211-firmware [deleted symlink]
config/rootfiles/core/next/update.sh

diff --git a/config/rootfiles/core/next/filelists/crda b/config/rootfiles/core/next/filelists/crda
deleted file mode 120000 (symlink)
index d68c46e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/crda
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/dracut b/config/rootfiles/core/next/filelists/dracut
deleted file mode 120000 (symlink)
index 1608699..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/grub b/config/rootfiles/core/next/filelists/grub
deleted file mode 120000 (symlink)
index 050745c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/iw b/config/rootfiles/core/next/filelists/iw
deleted file mode 120000 (symlink)
index 7c58a20..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iw
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/linux b/config/rootfiles/core/next/filelists/linux
deleted file mode 120000 (symlink)
index c469fe1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/linux-firmware b/config/rootfiles/core/next/filelists/linux-firmware
deleted file mode 120000 (symlink)
index 4bf91bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/linux-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/wireless-regdb b/config/rootfiles/core/next/filelists/wireless-regdb
deleted file mode 120000 (symlink)
index c9205b3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/wireless-regdb
\ No newline at end of file
diff --git a/config/rootfiles/core/next/filelists/zd1211-firmware b/config/rootfiles/core/next/filelists/zd1211-firmware
deleted file mode 120000 (symlink)
index 33985ce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zd1211-firmware
\ No newline at end of file
index 3632ff2380d45593f009a290562a466b4fce3d14..5a4353ff43732a4c5aca5dfbd9152f56a9fc22fb 100644 (file)
 #
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
-#
-KVER="xxxKVERxxx"
-MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
-# Nur den letzten Parameter verwenden
-echo $MOUNT > /dev/null
-MOUNT=$_
-if [ ! $MOUNT == "rw" ]; then
-       MOUNT="ro"
-fi
-
 
 #
-# check if we the backup file already exist
-if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
-    echo Moving backup to backup-old ...
-    mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
-       /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2
-fi
-echo First we made a backup of all files that was inside of the
-echo update archive. This may take a while ...
-# Add some files that are not in the package to backup
-echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
-echo boot >> /opt/pakfire/tmp/ROOTFILES
+# Remove old core updates from pakfire cache to save space...
+core=52
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
 
-# Backup the files
-tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
-    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
-
-echo
-echo Update Kernel to $KVER ...
-# Remove old kernel, configs, initrd, modules ...
-#
-rm -rf /boot/System.map-*
-rm -rf /boot/config-*
-rm -rf /boot/ipfirerd-*
-rm -rf /boot/vmlinuz-*
-rm -rf /lib/modules/*-ipfire
 #
-# Backup grub.conf
-#
-cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+#Stop services
 
-#
-# Stop services to save memory
-#
-/etc/init.d/snort stop
-/etc/init.d/squid stop
 /etc/init.d/ipsec stop
 
 #
@@ -86,66 +51,25 @@ rm -rf /usr/lib/libstrongswan.so.0.0.0
 rm -rf /usr/libexec/ipsec/plugins
 
 #
-# Unpack the updated files
-#
-echo
-echo Unpack the updated files ...
-#
-tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
-       --no-overwrite-dir
+#Extract files
+extract_files
 
 #
-# Enable ralink rt73 hardware encryption again
-rm -f /etc/modprobe.d/ralink_wireless
+#Start services
 
-#
-# Start services
-#
-/etc/init.d/squid start
-/etc/init.d/snort start
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
        /etc/init.d/ipsec start
 fi
 
 #
-# Modify grub.conf
-#
-echo
-echo Update grub configuration ...
-ROOT=`mount | grep " / " | cut -d" " -f1`
-if [ ! -z $ROOT ]; then
-       ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
-fi
-if [ ! -z $ROOTUUID ]; then
-       sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf
-else
-       sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
-fi
-sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
-sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
-
-if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then
-       echo "grub use default console ..."
-else
-       echo "grub use serial console ..."
-       sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf
-       sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf
-       sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf
-       sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf
-fi
-#
-# ReInstall grub
-#
-grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
-#
-# Rebuild Language
-#
+#Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-#
-# Delete old lm-sensor modullist to force search at next boot
-#
-rm -rf /etc/sysconfig/lm_sensors
-##
+
+#Rebuild module dep's
+#depmod 2.6.32.45-ipfire     >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
 ## Change version of Pakfire.conf
 ##
 #OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
@@ -175,6 +99,10 @@ rm -rf /etc/sysconfig/lm_sensors
 #echo
 #echo Please wait until pakfire has ended...
 #echo
-/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Upgrade finished. If you use a customized grub.cfg"
-/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Check it before reboot !!!"
-/usr/bin/logger -p syslog.emerg -t core-upgrade-next " *** Please reboot... *** "
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0