X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Frootfiles%2Fcore%2F28%2Fupdate.sh;h=6ac9d133f908c7963d4d9b09b12a33a32851ad6c;hp=c7d1fd9fb1a0684e4e49b7351cfeb742c6624bbe;hb=f5e44b937fcee4a9eacc8a9df93a295b6dc868cc;hpb=08e9dc015fee96830ed6842711daf4287e9a30f7

diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh
old mode 100755
new mode 100644
index c7d1fd9fb1..6ac9d133f9
--- a/config/rootfiles/core/28/update.sh
+++ b/config/rootfiles/core/28/update.sh
@@ -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,5 +134,12 @@ rm -rf /etc/sysconfig/lm_sensors
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
 #
+# 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... *** "