Add serial console detection to core28 updater

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 28 / update.sh

diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh
old mode 100755 (executable)
new mode 100644 (file)
index a66d670..6ac9d13
--- a/config/rootfiles/core/28/update.sh
+++ b/config/rootfiles/core/28/update.sh
@@ -25,9 +25,9 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
 OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
-NEWVERSION="2.3"
+NEWVERSION="2.5"
 #
-KVER="2.6.27.21"
+KVER="2.6.27.23"
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
@@ -50,7 +50,7 @@ echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES
 echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
 #
 tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \
-   -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
+    -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1
 echo
 echo Update IPfire to $NEWVERSION ...
 # Remove old kernel, configs, initrd, modules ...
@@ -61,6 +61,10 @@ rm -rf /boot/ipfirerd-*
 rm -rf /boot/vmlinuz-*
 rm -rf /lib/modules/
 #
+# Backup grub.conf
+#
+cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
+#
 # Unpack the updated files
 #
 echo
@@ -76,6 +80,16 @@ echo Update grub configuration ...
 sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
 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
 #
 # Made emergency - initramdisk
 #
@@ -120,11 +134,12 @@ rm -rf /etc/sysconfig/lm_sensors
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
 #
-# Create new issue
-#
-echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
-echo =================================== >> /etc/issue
-echo \\n running on \\s \\r \\m >> /etc/issue
+# Regenerate qos-scripts
+[ -e /var/ipfire/qos/enable ] && /usr/local/bin/qosctrl stop
+[ -e /var/ipfire/qos/enable ] && /usr/local/bin/qosctrl generate
+[ ! -e /var/ipfire/qos/enable ] && rm -f /var/ipfire/qos/bin/qos.sh
 #
 # This core-update need a reboot
-/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. Please reboot... "
+/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Upgrade finished. If you use a customized grub.cfg"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-28 "Check it before reboot !!!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-28 " *** Please reboot... *** "