Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

config/rootfiles/core/fifteen/filelists/apache2

@@ -0,0 +1 @@
+../../../common/apache2

config/rootfiles/core/fifteen/filelists/armv5tel/binutils

@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils

config/rootfiles/core/fifteen/filelists/armv5tel/dracut

@@ -0,0 +1 @@
+../../../../common/armv5tel/dracut

config/rootfiles/core/fifteen/filelists/armv5tel/gcc

@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc

config/rootfiles/core/fifteen/filelists/armv5tel/initscripts

@@ -0,0 +1 @@
+../../../../common/armv5tel/initscripts

config/rootfiles/core/fifteen/filelists/armv5tel/linux-kirkwood

@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood

config/rootfiles/core/fifteen/filelists/armv5tel/linux-multi

@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi

config/rootfiles/core/fifteen/filelists/armv5tel/linux-rpi

@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi

config/rootfiles/core/fifteen/filelists/armv5tel/lm_sensors

@@ -0,0 +1 @@
+../../../../common/armv5tel/lm_sensors

config/rootfiles/core/fifteen/filelists/armv5tel/rpi-firmware

@@ -0,0 +1 @@
+../../../../common/armv5tel/rpi-firmware

config/rootfiles/core/fifteen/filelists/armv5tel/u-boot

@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot

config/rootfiles/core/fifteen/filelists/armv5tel/util-linux

@@ -0,0 +1 @@
+../../../../common/armv5tel/util-linux

config/rootfiles/core/fifteen/filelists/bridge-utils

@@ -0,0 +1 @@
+../../../common/bridge-utils

config/rootfiles/core/fifteen/filelists/cyrus-sasl

@@ -0,0 +1 @@
+../../../common/cyrus-sasl

config/rootfiles/core/fifteen/filelists/dosfstools

@@ -0,0 +1 @@
+../../../common/dosfstools

config/rootfiles/core/fifteen/filelists/files

@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
+etc/collectd.conf
 etc/rc.d/init.d/network
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/gui.cgi
@@ -15,9 +16,11 @@ srv/web/ipfire/html/themes/darkdos
 srv/web/ipfire/html/themes/ipfire
 srv/web/ipfire/html/themes/ipfire-legacy
 srv/web/ipfire/html/themes/maniac
+usr/local/bin/setddns.pl
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/exclude
 var/ipfire/backup/include
 var/ipfire/general-functions.pl
 var/ipfire/header.pl
+var/ipfire/graphs.pl
 var/ipfire/langs

config/rootfiles/core/fifteen/filelists/fireinfo

@@ -0,0 +1 @@
+../../../common/fireinfo

config/rootfiles/core/fifteen/filelists/i586/binutils

@@ -0,0 +1 @@
+../../../../common/i586/binutils

config/rootfiles/core/fifteen/filelists/i586/dracut

@@ -0,0 +1 @@
+../../../../common/i586/dracut

config/rootfiles/core/fifteen/filelists/i586/gcc

@@ -0,0 +1 @@
+../../../../common/i586/gcc

config/rootfiles/core/fifteen/filelists/i586/grub

@@ -0,0 +1 @@
+../../../../common/i586/grub

config/rootfiles/core/fifteen/filelists/i586/initscripts

@@ -0,0 +1 @@
+../../../../common/i586/initscripts

config/rootfiles/core/fifteen/filelists/i586/linux

@@ -0,0 +1 @@
+../../../../common/i586/linux

config/rootfiles/core/fifteen/filelists/i586/lm_sensors

@@ -0,0 +1 @@
+../../../../common/i586/lm_sensors

config/rootfiles/core/fifteen/filelists/i586/util-linux

@@ -0,0 +1 @@
+../../../../common/i586/util-linux

config/rootfiles/core/fifteen/filelists/iptables

@@ -0,0 +1 @@
+../../../common/iptables

config/rootfiles/core/fifteen/filelists/iw

@@ -0,0 +1 @@
+../../../common/iw

config/rootfiles/core/fifteen/filelists/kmod

@@ -0,0 +1 @@
+../../../common/kmod

config/rootfiles/core/fifteen/filelists/libnl

@@ -0,0 +1 @@
+../../../common/libnl

config/rootfiles/core/fifteen/filelists/libusbx

@@ -0,0 +1 @@
+../../../common/libusbx

config/rootfiles/core/fifteen/filelists/mysql-libs

@@ -0,0 +1 @@
+../../../common/mysql-libs

config/rootfiles/core/fifteen/filelists/net-tools

@@ -0,0 +1 @@
+../../../common/net-tools

config/rootfiles/core/fifteen/filelists/setup

@@ -0,0 +1 @@
+../../../common/setup

config/rootfiles/core/fifteen/filelists/udev

@@ -0,0 +1 @@
+../../../common/udev

config/rootfiles/core/fifteen/filelists/usbutils

@@ -0,0 +1 @@
+../../../common/usbutils

config/rootfiles/core/fifteen/filelists/xz

@@ -0,0 +1 @@
+../../../common/xz

config/rootfiles/core/fifteen/update.sh

@@ -24,25 +24,181 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
+function add_to_backup ()
+{
+	# Add path to ROOTFILES but remove old entries to prevent double
+	# files in the tar
+	grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
+	mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
+	echo $1 >> /opt/pakfire/tmp/ROOTFILES
+}
+
 #
 # Remove old core updates from pakfire cache to save space...
-core=74
+core=76
 for (( i=1; i<=$core; i++ ))
 do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+#
+# Do some sanity checks.
+case $(uname -r) in
+	*-ipfire-versatile )
+		/usr/bin/logger -p syslog.emerg -t ipfire \
+			"core-update-$core: ERROR cannot update. versatile support is dropped."
+		# Report no error to pakfire. So it does not try to install it again.
+		exit 0
+		;;
+	*-ipfire-xen )
+		BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1`
+		if [ $BOOTSIZE -lt 28000 ]; then
+			/usr/bin/logger -p syslog.emerg -t ipfire \
+				"core-update-$core: ERROR cannot update because not enough space on boot."
+			exit 2
+		fi
+		;;
+	*-ipfire* )
+		# Ok.
+		;;
+	* )
+		/usr/bin/logger -p syslog.emerg -t ipfire \
+			"core-update-$core: ERROR cannot update. No IPFire Kernel."
+		exit 1
+	;;
+esac
+
+
+#
+#
+KVER="3.10.25"
+MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | 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$core_$KVER.tar.xz ]; then
+    echo Moving backup to backup-old ...
+    mv -f /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \
+       /var/ipfire/backup/core-upgrade$core_$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
+add_to_backup lib/modules
+add_to_backup etc/udev
+add_to_backup lib/udev
+add_to_backup boot
+add_to_backup etc/sysconfig/lm_sensors
+add_to_backup etc/sysconfig/rc.local
+add_to_backup srv/web/ipfire/html/themes/ipfire
+add_to_backup usr/lib/engines
+add_to_backup etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+add_to_backup etc/rc.d/init.d/networking/red.up/25-portfw
+add_to_backup etc/rc.d/init.d/networking/red.up/26-xtaccess
+add_to_backup usr/local/bin/setportfw
+add_to_backup usr/local/bin/setdmzholes
+add_to_backup usr/local/bin/setxtaccess
+add_to_backup usr/local/bin/outgoingfwctrl
+add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
+add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
+
+# Backup the files
+tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \
+    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 70000 ]; then
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-$core: ERROR cannot update because not enough free space on root."
+	exit 2
+fi
+
+
+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 /boot/uImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /lib/modules
+
+#
+# Remove old udev rules.
+#
+if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then
+	cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
+fi
+cp /etc/udev/rules.d/30-persistent-network.rules /tmp/
+rm -rf /etc/udev
+rm -rf /lib/udev
+mkdir -p /etc/udev/rules.d
+if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then
+	mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
+fi
+mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
+
+case $(uname -m) in
+	i?86 )
+		#
+		# Backup grub.conf
+		#
+		cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+	;;
+esac
+#
+#Stop services
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
 # Remove the old default theme
 rm -rf /srv/web/ipfire/html/themes/ipfire
 
-# Stop services
+#
+#Extract files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
 
+# Check diskspace on boot
+BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
 
-# Extract files
-extract_files
+if [ $BOOTSPACE -lt 1000 ]; then
+	case $(uname -r) in
+		*-ipfire-kirkwood )
+			# Special handling for old kirkwood images.
+			# (install only kirkwood kernel)
+			rm -rf /boot/*
+			tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
+				--numeric-owner -C / --wildcards 'boot/*-kirkwood*'
+			;;
+		* )
+			/usr/bin/logger -p syslog.emerg -t ipfire \
+				"core-update-$core: FATAL-ERROR space run out on boot. System is not bootable..."
+			/etc/init.d/apache start
+			exit 4
+			;;
+	esac
+fi
 
-# Start services
+#
+#Reload init to close old linker/glibc
+telinit u
 
+# Regenerate ipsec configuration files.
+/srv/web/ipfire/cgi-bin/vpnmain.cgi
 
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@ -82,16 +238,128 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
 # Remove old firewall configuration files
 rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
 
+#
+# Start services
+#
+/etc/init.d/apache start
+/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
+
+
+case $(uname -m) in
+	i?86 )
+		#
+		# 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,115200n8 panic=10 |g" /boot/grub/grub.conf
+		fi
+
+		#
+		# ReInstall grub
+		#
+			echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
+			grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
+	;;
+esac
+#
+# Delete old lm-sensor modullist to force search at next boot
+#
+rm -rf /etc/sysconfig/lm_sensors
+
+
+# Force (re)install pae kernel if pae is supported
+rm -rf /opt/pakfire/db/*/meta-linux-pae
+if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+	ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+	BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+	if [ $BOOTSPACE -lt 8000 -o $ROOTSPACE -lt 70000 ]; then
+		/usr/bin/logger -p syslog.emerg -t ipfire \
+			"core-update-$core: WARNING not enough space for pae kernel."
+	else
+		echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+		echo "ProgVersion: 3.10.24" >> /opt/pakfire/db/installed/meta-linux-pae
+		echo "Release: 30"     >> /opt/pakfire/db/installed/meta-linux-pae
+	fi
+fi
+
+# Force reinstall xen kernel if it was installed
+if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
+	echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
+	echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
+	echo "Release: 24"     >> /opt/pakfire/db/installed/meta-linux-xen
+	# Add xvc0 to /etc/securetty
+	echo "xvc0" >> /etc/securetty
+fi
+
+#
+# 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 ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+
 sync
 
-# This update need a reboot...
-touch /var/run/need_reboot
-
-# Finish
-# Update the fireinfo profile
+#
+#Finish
 (
 	/etc/init.d/fireinfo start
 	sendprofile
 ) >/dev/null 2>&1 &
 
+echo
+echo Please wait until pakfire has ended...
+echo
+#Don't report the exitcode last command
 exit 0
+