]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
core51: add kernel, compat-wireless, iw to core-updater.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 24 Jul 2011 08:10:58 +0000 (10:10 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 24 Jul 2011 08:10:58 +0000 (10:10 +0200)
12 files changed:
config/rootfiles/core/51/exclude [new file with mode: 0644]
config/rootfiles/core/51/filelists/crda [moved from config/rootfiles/core/next/filelists/crda with 100% similarity]
config/rootfiles/core/51/filelists/dracut [new symlink]
config/rootfiles/core/51/filelists/files [new file with mode: 0644]
config/rootfiles/core/51/filelists/grub [new symlink]
config/rootfiles/core/51/filelists/iw [new symlink]
config/rootfiles/core/51/filelists/linux [new symlink]
config/rootfiles/core/51/filelists/linux-firmware [moved from config/rootfiles/core/next/filelists/linux-firmware with 100% similarity]
config/rootfiles/core/51/filelists/wireless-regdb [moved from config/rootfiles/core/next/filelists/wireless-regdb with 100% similarity]
config/rootfiles/core/51/filelists/zd1211-firmware [moved from config/rootfiles/core/next/filelists/zd1211-firmware with 100% similarity]
config/rootfiles/core/51/meta [new file with mode: 0644]
config/rootfiles/core/51/update.sh [new file with mode: 0644]

diff --git a/config/rootfiles/core/51/exclude b/config/rootfiles/core/51/exclude
new file mode 100644 (file)
index 0000000..ce199d8
--- /dev/null
@@ -0,0 +1 @@
+srv/web/ipfire/html/proxy.pac
diff --git a/config/rootfiles/core/51/filelists/dracut b/config/rootfiles/core/51/filelists/dracut
new file mode 120000 (symlink)
index 0000000..1608699
--- /dev/null
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file
diff --git a/config/rootfiles/core/51/filelists/files b/config/rootfiles/core/51/filelists/files
new file mode 100644 (file)
index 0000000..0037af1
--- /dev/null
@@ -0,0 +1 @@
+etc/system-release
diff --git a/config/rootfiles/core/51/filelists/grub b/config/rootfiles/core/51/filelists/grub
new file mode 120000 (symlink)
index 0000000..050745c
--- /dev/null
@@ -0,0 +1 @@
+../../../common/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/51/filelists/iw b/config/rootfiles/core/51/filelists/iw
new file mode 120000 (symlink)
index 0000000..7c58a20
--- /dev/null
@@ -0,0 +1 @@
+../../../common/iw
\ No newline at end of file
diff --git a/config/rootfiles/core/51/filelists/linux b/config/rootfiles/core/51/filelists/linux
new file mode 120000 (symlink)
index 0000000..c469fe1
--- /dev/null
@@ -0,0 +1 @@
+../../../common/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/51/meta b/config/rootfiles/core/51/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh
new file mode 100644 (file)
index 0000000..78e6a53
--- /dev/null
@@ -0,0 +1,156 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=51
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+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
+
+# 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 to save memory
+#
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+
+#
+# Unpack the updated files
+#
+echo
+echo Unpack the updated files ...
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+       --no-overwrite-dir
+
+#
+# Enable ralink rt73 hardware encryption again
+rm -f /etc/modprobe.d/ralink_wireless
+
+#
+# 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
+#
+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
+
+# Reboot message to console
+/usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-51 " *** Please reboot... *** "
+
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0