Add hint to check grub.conf after installing core28

Delete qos.sh if qos is disabled

diff --git a/config/rootfiles/core/28/update.sh b/config/rootfiles/core/28/update.sh
index 7168c7ba8c2f7822cd95656bc43b4fcf47c5e172..16b254244f15dd9c1866c6e8f74d4a8fc29951b4 100644 (file)
--- a/config/rootfiles/core/28/update.sh
+++ b/config/rootfiles/core/28/update.sh
@@ -123,6 +123,9 @@ 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
 # 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
 #
 # 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 "(eq. Serial Console or Custom Videomodes) Check it!"
+/usr/bin/logger -p syslog.emerg -t core-upgrade-28 " *** Please reboot... *** "

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 90a04714c26bd1353a02c1b2a832f6f43c2c600a..3174ac2107ea20cdafd9bf7089629f7277022489 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -76,6 +76,7 @@
 * cpufrequtils-005
 * cups-1.3.9
 * curl-7.19.4
 * cpufrequtils-005
 * cups-1.3.9
 * curl-7.19.4

+* curl-7.19.5

 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * db-4.4.20
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * db-4.4.20


@@ -233,6 +234,7 @@
 * noip_updater_v1.6
 * ntfs-3g-2009.2.1
 * ntp-4.2.2
 * noip_updater_v1.6
 * ntfs-3g-2009.2.1
 * ntp-4.2.2

+* ntp-4.2.4p7

 * ocaml-3.09.2
 * oinkmaster-2.0
 * openldap-2.3.20
 * ocaml-3.09.2
 * oinkmaster-2.0
 * openldap-2.3.20