started updater from 2.11 to 2.13.

2026-04-10 02:55:55 +02:00 · 2012-11-06 23:59:30 +01:00
parent 1d4a8e4b0d
commit f0a4269bfe
100 changed files with 334 additions and 0 deletions
--- a/config/rootfiles/core/65/exclude
+++ b/config/rootfiles/core/65/exclude
@@ -0,0 +1,15 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
--- a/config/rootfiles/core/65/filelists/armv5tel/binutils
+++ b/config/rootfiles/core/65/filelists/armv5tel/binutils
@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils
--- a/config/rootfiles/core/65/filelists/armv5tel/dracut
+++ b/config/rootfiles/core/65/filelists/armv5tel/dracut
@@ -0,0 +1 @@
+../../../../common/armv5tel/dracut
--- a/config/rootfiles/core/65/filelists/armv5tel/gcc
+++ b/config/rootfiles/core/65/filelists/armv5tel/gcc
@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc
--- a/config/rootfiles/core/65/filelists/armv5tel/glibc
+++ b/config/rootfiles/core/65/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
--- a/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood
+++ b/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
--- a/config/rootfiles/core/65/filelists/armv5tel/linux-omap
+++ b/config/rootfiles/core/65/filelists/armv5tel/linux-omap
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-omap
--- a/config/rootfiles/core/65/filelists/armv5tel/linux-rpi
+++ b/config/rootfiles/core/65/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
--- a/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware
+++ b/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware
@@ -0,0 +1 @@
+../../../../common/armv5tel/rpi-firmware
--- a/config/rootfiles/core/65/filelists/armv5tel/u-boot
+++ b/config/rootfiles/core/65/filelists/armv5tel/u-boot
@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot
--- a/config/rootfiles/core/65/filelists/armv5tel/util-linux
+++ b/config/rootfiles/core/65/filelists/armv5tel/util-linux
@@ -0,0 +1 @@
+../../../../common/armv5tel/util-linux
--- a/config/rootfiles/core/65/filelists/autoconf
+++ b/config/rootfiles/core/65/filelists/autoconf
@@ -0,0 +1 @@
+../../../common/autoconf
--- a/config/rootfiles/core/65/filelists/automake
+++ b/config/rootfiles/core/65/filelists/automake
@@ -0,0 +1 @@
+../../../common/automake
--- a/config/rootfiles/core/65/filelists/bash
+++ b/config/rootfiles/core/65/filelists/bash
@@ -0,0 +1 @@
+../../../common/bash
--- a/config/rootfiles/core/65/filelists/cairo
+++ b/config/rootfiles/core/65/filelists/cairo
@@ -0,0 +1 @@
+../../../common/cairo
--- a/config/rootfiles/core/65/filelists/capi4k-utils
+++ b/config/rootfiles/core/65/filelists/capi4k-utils
@@ -0,0 +1 @@
+../../../common/capi4k-utils
--- a/config/rootfiles/core/65/filelists/cmake
+++ b/config/rootfiles/core/65/filelists/cmake
@@ -0,0 +1 @@
+../../../common/cmake
--- a/config/rootfiles/core/65/filelists/collectd
+++ b/config/rootfiles/core/65/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
--- a/config/rootfiles/core/65/filelists/compat-wireless
+++ b/config/rootfiles/core/65/filelists/compat-wireless
@@ -0,0 +1 @@
+../../../common/compat-wireless
--- a/config/rootfiles/core/65/filelists/coreutils
+++ b/config/rootfiles/core/65/filelists/coreutils
@@ -0,0 +1 @@
+../../../common/coreutils
--- a/config/rootfiles/core/65/filelists/curl
+++ b/config/rootfiles/core/65/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
--- a/config/rootfiles/core/65/filelists/cyrus-sasl
+++ b/config/rootfiles/core/65/filelists/cyrus-sasl
@@ -0,0 +1 @@
+../../../common/cyrus-sasl
--- a/config/rootfiles/core/65/filelists/daq
+++ b/config/rootfiles/core/65/filelists/daq
@@ -0,0 +1 @@
+../../../common/daq
--- a/config/rootfiles/core/65/filelists/dejavu-fonts-ttf
+++ b/config/rootfiles/core/65/filelists/dejavu-fonts-ttf
@@ -0,0 +1 @@
+../../../common/dejavu-fonts-ttf
--- a/config/rootfiles/core/65/filelists/dhcp
+++ b/config/rootfiles/core/65/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
--- a/config/rootfiles/core/65/filelists/dvb-firmwares
+++ b/config/rootfiles/core/65/filelists/dvb-firmwares
@@ -0,0 +1 @@
+../../../common/dvb-firmwares
--- a/config/rootfiles/core/65/filelists/e2fsprogs
+++ b/config/rootfiles/core/65/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
--- a/config/rootfiles/core/65/filelists/file
+++ b/config/rootfiles/core/65/filelists/file
@@ -0,0 +1 @@
+../../../common/file
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -0,0 +1,20 @@
+etc/system-release
+etc/issue
+etc/sysctl.conf
+etc/securetty
+opt/pakfire/etc/pakfire.conf
+etc/rc.d/init.d/partresize
+etc/rc.d/init.d/fsresize
+etc/rc.d/init.d/setclock
+etc/rc.d/init.d/tmpfs
+etc/rc.d/rc0.d/K47setclock
+etc/rc.d/rc6.d/K47setclock
+srv/web/ipfire/cgi-bin/credits.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/services.cgi
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/local/sbin/setup
+var/ipfire/langs
+var/ipfire/qos/bin/makeqosscripts.pl
--- a/config/rootfiles/core/65/filelists/fontconfig
+++ b/config/rootfiles/core/65/filelists/fontconfig
@@ -0,0 +1 @@
+../../../common/fontconfig
--- a/config/rootfiles/core/65/filelists/gawk
+++ b/config/rootfiles/core/65/filelists/gawk
@@ -0,0 +1 @@
+../../../common/gawk
--- a/config/rootfiles/core/65/filelists/gettext
+++ b/config/rootfiles/core/65/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
--- a/config/rootfiles/core/65/filelists/glib
+++ b/config/rootfiles/core/65/filelists/glib
@@ -0,0 +1 @@
+../../../common/glib
--- a/config/rootfiles/core/65/filelists/gmp
+++ b/config/rootfiles/core/65/filelists/gmp
@@ -0,0 +1 @@
+../../../common/gmp
--- a/config/rootfiles/core/65/filelists/gmp-compat
+++ b/config/rootfiles/core/65/filelists/gmp-compat
@@ -0,0 +1 @@
+../../../common/gmp-compat
--- a/config/rootfiles/core/65/filelists/gnupg
+++ b/config/rootfiles/core/65/filelists/gnupg
@@ -0,0 +1 @@
+../../../common/gnupg
--- a/config/rootfiles/core/65/filelists/grep
+++ b/config/rootfiles/core/65/filelists/grep
@@ -0,0 +1 @@
+../../../common/grep
--- a/config/rootfiles/core/65/filelists/hdparm
+++ b/config/rootfiles/core/65/filelists/hdparm
@@ -0,0 +1 @@
+../../../common/hdparm
--- a/config/rootfiles/core/65/filelists/i586/acpid
+++ b/config/rootfiles/core/65/filelists/i586/acpid
@@ -0,0 +1 @@
+../../../../common/i586/acpid
--- a/config/rootfiles/core/65/filelists/i586/binutils
+++ b/config/rootfiles/core/65/filelists/i586/binutils
@@ -0,0 +1 @@
+../../../../common/i586/binutils
--- a/config/rootfiles/core/65/filelists/i586/dracut
+++ b/config/rootfiles/core/65/filelists/i586/dracut
@@ -0,0 +1 @@
+../../../../common/i586/dracut
--- a/config/rootfiles/core/65/filelists/i586/gcc
+++ b/config/rootfiles/core/65/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
--- a/config/rootfiles/core/65/filelists/i586/glibc
+++ b/config/rootfiles/core/65/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
--- a/config/rootfiles/core/65/filelists/i586/grub
+++ b/config/rootfiles/core/65/filelists/i586/grub
@@ -0,0 +1,2 @@
+#boot/grub
+boot/grub/grub.conf
--- a/config/rootfiles/core/65/filelists/i586/linux
+++ b/config/rootfiles/core/65/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
--- a/config/rootfiles/core/65/filelists/i586/strongswan-padlock
+++ b/config/rootfiles/core/65/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
--- a/config/rootfiles/core/65/filelists/i586/util-linux
+++ b/config/rootfiles/core/65/filelists/i586/util-linux
@@ -0,0 +1 @@
+../../../../common/i586/util-linux
--- a/config/rootfiles/core/65/filelists/inetutils
+++ b/config/rootfiles/core/65/filelists/inetutils
@@ -0,0 +1 @@
+../../../common/inetutils
--- a/config/rootfiles/core/65/filelists/iproute2
+++ b/config/rootfiles/core/65/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
--- a/config/rootfiles/core/65/filelists/iptables
+++ b/config/rootfiles/core/65/filelists/iptables
@@ -0,0 +1 @@
+../../../common/iptables
--- a/config/rootfiles/core/65/filelists/kbd
+++ b/config/rootfiles/core/65/filelists/kbd
@@ -0,0 +1 @@
+../../../common/kbd
--- a/config/rootfiles/core/65/filelists/less
+++ b/config/rootfiles/core/65/filelists/less
@@ -0,0 +1 @@
+../../../common/less
--- a/config/rootfiles/core/65/filelists/libffi
+++ b/config/rootfiles/core/65/filelists/libffi
@@ -0,0 +1 @@
+../../../common/libffi
--- a/config/rootfiles/core/65/filelists/libnl
+++ b/config/rootfiles/core/65/filelists/libnl
@@ -0,0 +1 @@
+../../../common/libnl
--- a/config/rootfiles/core/65/filelists/libsigc++
+++ b/config/rootfiles/core/65/filelists/libsigc++
@@ -0,0 +1 @@
+../../../common/libsigc++
--- a/config/rootfiles/core/65/filelists/libtool
+++ b/config/rootfiles/core/65/filelists/libtool
@@ -0,0 +1 @@
+../../../common/libtool
--- a/config/rootfiles/core/65/filelists/linux-atm
+++ b/config/rootfiles/core/65/filelists/linux-atm
@@ -0,0 +1 @@
+../../../common/linux-atm
--- a/config/rootfiles/core/65/filelists/linux-firmware
+++ b/config/rootfiles/core/65/filelists/linux-firmware
@@ -0,0 +1 @@
+../../../common/linux-firmware
--- a/config/rootfiles/core/65/filelists/m4
+++ b/config/rootfiles/core/65/filelists/m4
@@ -0,0 +1 @@
+../../../common/m4
--- a/config/rootfiles/core/65/filelists/mISDNuser
+++ b/config/rootfiles/core/65/filelists/mISDNuser
@@ -0,0 +1 @@
+../../../common/mISDNuser
--- a/config/rootfiles/core/65/filelists/man
+++ b/config/rootfiles/core/65/filelists/man
@@ -0,0 +1 @@
+../../../common/man
--- a/config/rootfiles/core/65/filelists/misc-progs
+++ b/config/rootfiles/core/65/filelists/misc-progs
@@ -0,0 +1 @@
+../../../common/misc-progs
--- a/config/rootfiles/core/65/filelists/mpfr
+++ b/config/rootfiles/core/65/filelists/mpfr
@@ -0,0 +1 @@
+../../../common/mpfr
--- a/config/rootfiles/core/65/filelists/ncurses
+++ b/config/rootfiles/core/65/filelists/ncurses
@@ -0,0 +1 @@
+../../../common/ncurses
--- a/config/rootfiles/core/65/filelists/newt
+++ b/config/rootfiles/core/65/filelists/newt
@@ -0,0 +1 @@
+../../../common/newt
--- a/config/rootfiles/core/65/filelists/openldap
+++ b/config/rootfiles/core/65/filelists/openldap
@@ -0,0 +1 @@
+../../../common/openldap
--- a/config/rootfiles/core/65/filelists/openssl
+++ b/config/rootfiles/core/65/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
--- a/config/rootfiles/core/65/filelists/pam
+++ b/config/rootfiles/core/65/filelists/pam
@@ -0,0 +1 @@
+../../../common/pam
--- a/config/rootfiles/core/65/filelists/pango
+++ b/config/rootfiles/core/65/filelists/pango
@@ -0,0 +1 @@
+../../../common/pango
--- a/config/rootfiles/core/65/filelists/pciutils
+++ b/config/rootfiles/core/65/filelists/pciutils
@@ -0,0 +1 @@
+../../../common/pciutils
--- a/config/rootfiles/core/65/filelists/pcmciautils
+++ b/config/rootfiles/core/65/filelists/pcmciautils
@@ -0,0 +1 @@
+../../../common/pcmciautils
--- a/config/rootfiles/core/65/filelists/pcre
+++ b/config/rootfiles/core/65/filelists/pcre
@@ -0,0 +1 @@
+../../../common/pcre
--- a/config/rootfiles/core/65/filelists/pcre-compat
+++ b/config/rootfiles/core/65/filelists/pcre-compat
@@ -0,0 +1 @@
+../../../common/pcre-compat
--- a/config/rootfiles/core/65/filelists/pixman
+++ b/config/rootfiles/core/65/filelists/pixman
@@ -0,0 +1 @@
+../../../common/pixman
--- a/config/rootfiles/core/65/filelists/popt
+++ b/config/rootfiles/core/65/filelists/popt
@@ -0,0 +1 @@
+../../../common/popt
--- a/config/rootfiles/core/65/filelists/pptp
+++ b/config/rootfiles/core/65/filelists/pptp
@@ -0,0 +1 @@
+../../../common/pptp
--- a/config/rootfiles/core/65/filelists/readline
+++ b/config/rootfiles/core/65/filelists/readline
@@ -0,0 +1 @@
+../../../common/readline
--- a/config/rootfiles/core/65/filelists/readline-compat
+++ b/config/rootfiles/core/65/filelists/readline-compat
@@ -0,0 +1 @@
+../../../common/readline-compat
--- a/config/rootfiles/core/65/filelists/reiserfsprogs
+++ b/config/rootfiles/core/65/filelists/reiserfsprogs
@@ -0,0 +1 @@
+../../../common/reiserfsprogs
--- a/config/rootfiles/core/65/filelists/rrdtool
+++ b/config/rootfiles/core/65/filelists/rrdtool
@@ -0,0 +1 @@
+../../../common/rrdtool
--- a/config/rootfiles/core/65/filelists/screen
+++ b/config/rootfiles/core/65/filelists/screen
@@ -0,0 +1 @@
+../../../common/screen
--- a/config/rootfiles/core/65/filelists/sdparm
+++ b/config/rootfiles/core/65/filelists/sdparm
@@ -0,0 +1 @@
+../../../common/sdparm
--- a/config/rootfiles/core/65/filelists/sed
+++ b/config/rootfiles/core/65/filelists/sed
@@ -0,0 +1 @@
+../../../common/sed
--- a/config/rootfiles/core/65/filelists/shadow
+++ b/config/rootfiles/core/65/filelists/shadow
@@ -0,0 +1 @@
+../../../common/shadow
--- a/config/rootfiles/core/65/filelists/slang
+++ b/config/rootfiles/core/65/filelists/slang
@@ -0,0 +1 @@
+../../../common/slang
--- a/config/rootfiles/core/65/filelists/smartmontools
+++ b/config/rootfiles/core/65/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
--- a/config/rootfiles/core/65/filelists/snort
+++ b/config/rootfiles/core/65/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
--- a/config/rootfiles/core/65/filelists/strongswan
+++ b/config/rootfiles/core/65/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
--- a/config/rootfiles/core/65/filelists/sysfsutils
+++ b/config/rootfiles/core/65/filelists/sysfsutils
@@ -0,0 +1 @@
+../../../common/sysfsutils
--- a/config/rootfiles/core/65/filelists/sysvinit
+++ b/config/rootfiles/core/65/filelists/sysvinit
@@ -0,0 +1 @@
+../../../common/sysvinit
--- a/config/rootfiles/core/65/filelists/texinfo
+++ b/config/rootfiles/core/65/filelists/texinfo
@@ -0,0 +1 @@
+../../../common/texinfo
--- a/config/rootfiles/core/65/filelists/tzdata
+++ b/config/rootfiles/core/65/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
--- a/config/rootfiles/core/65/filelists/udev
+++ b/config/rootfiles/core/65/filelists/udev
@@ -0,0 +1 @@
+../../../common/udev
--- a/config/rootfiles/core/65/filelists/usbutils
+++ b/config/rootfiles/core/65/filelists/usbutils
@@ -0,0 +1 @@
+../../../common/usbutils
--- a/config/rootfiles/core/65/filelists/wget
+++ b/config/rootfiles/core/65/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
--- a/config/rootfiles/core/65/filelists/wpa_supplicant
+++ b/config/rootfiles/core/65/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
--- a/config/rootfiles/core/65/filelists/xz
+++ b/config/rootfiles/core/65/filelists/xz
@@ -0,0 +1 @@
+../../../common/xz
--- a/config/rootfiles/core/65/filelists/zlib
+++ b/config/rootfiles/core/65/filelists/zlib
@@ -0,0 +1 @@
+../../../common/zlib
--- a/config/rootfiles/core/65/meta
+++ b/config/rootfiles/core/65/meta
@@ -0,0 +1 @@
+DEPS=""
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -0,0 +1,201 @@
+#!/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) 2012 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=65
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+KVER="3.2.33"
+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.xz ]; then
+    echo Moving backup to backup-old ...
+    mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
+       /var/ipfire/backup/core-upgrade_$KVER-old.tar.xz
+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 etc/udev >> /opt/pakfire/tmp/ROOTFILES
+echo lib/udev >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo etc/snort >> /opt/pakfire/tmp/ROOTFILES
+echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES
+
+# Backup the files
+tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
+    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /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
+#
+# Remove old udev rules.
+#
+cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
+cp /etc/udev/rules.d/30-persistent-network.rules /tmp/
+rm -rf /etc/udev
+rm -rf /lib/udev
+mkdir -p /etc/udev/rules.d
+mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
+mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
+
+#
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+
+#
+#Stop services
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+
+#Remove old snort
+rm -rf /etc/snort
+rm -rf /usr/lib/snort_*
+
+#
+#Extract files
+extract_files
+
+#
+# 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
+
+#
+# Rebuild qosscript if enabled
+#
+if [ -e /var/ipfire/qos/enable ]; then
+	/usr/local/bin/qosctrl stop
+	/usr/local/bin/qosctrl generate
+	/usr/local/bin/qosctrl 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
+#
+# Delete old lm-sensor modullist to force search at next boot
+#
+rm -rf /etc/sysconfig/lm_sensors
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#
+# Remove meta's of packages that are now common...
+#
+rm -rf /opt/pakfire/db/*/meta-fontconfig
+rm -rf /opt/pakfire/db/*/meta-glib
+
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash'                                        >  /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo '    sleep 1'                                        >> /tmp/pak_update
+echo 'done'                                               >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do'   >> /tmp/pak_update
+echo '    sleep 1'                                        >> /tmp/pak_update
+echo 'done'                                               >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+
+sync
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+echo
+echo Please wait until pakfire has ended...
+echo
+#Don't report the exitcode last command
+exit 0
+