From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 26 May 2010 19:35:17 +0000 (+0200)
Subject: core38 update: add cryptodev to /etc/sysconfig/modules.
X-Git-Tag: v2.9-beta1~276
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d2d2da1038f20022a7f56f687b4fc1db4049c67b

core38 update: add cryptodev to /etc/sysconfig/modules.
change service stop and startorder at update.
---

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
index 9a95149ad6..716c6a5206 100644
--- a/config/rootfiles/core/38/update.sh
+++ b/config/rootfiles/core/38/update.sh
@@ -80,6 +80,9 @@ rm -rf /usr/libexec/ipsec
 #
 cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
 #
+# Stop sysklogd
+/etc/init.d/sysklogd stop
+#
 # Unpack the updated files
 #
 echo
@@ -88,6 +91,10 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
 	--no-overwrite-dir
 #
+# Start Sevices
+/etc/init.d/sysklogd start
+/etc/init.d/squid start
+#
 # Modify grub.conf
 #
 echo
@@ -137,10 +144,6 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
-# Delete old lm-sensor modullist...
-#
-rm -rf /etc/sysconfig/lm_sensors
-#
 # Cleanup Collectd statistics...
 #
 PRECLEAN=`du -sh /var/log/rrd/collectd`
@@ -161,6 +164,13 @@ POSTCLEAN=`du -sh /var/log/rrd/collectd`
 #
 echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size.
 #
+# Start collectd
+/etc/init.d/collectd start
+#
+# Delete old lm-sensor modullist to force search at next boot
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
 # USB Modeswitch conf now called setup, rename ...
 #
 if [ -e /etc/usb_modeswitch.conf ]; then
@@ -192,10 +202,18 @@ sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf
 chown nobody:nobody /var/ipfire/vpn/ipsec.conf
 chmod 644 /var/ipfire/vpn/ipsec.conf
 #
-#
-# Start Sevices
-#
-/etc/init.d/squid start
+# Add cryptodev to /etc/sysconfig/modules
+mv /etc/sysconfig/modules /etc/sysconfig/modules.org
+cat /etc/sysconfig/modules.org | \
+grep -v "cryptodev" | \
+grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules
+echo "" >> /etc/sysconfig/modules
+echo "### cryptodev" >> /etc/sysconfig/modules
+echo "#" >> /etc/sysconfig/modules
+echo "cryptodev" >> /etc/sysconfig/modules
+echo "" >> /etc/sysconfig/modules
+echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules
+chmod 644 /etc/sysconfig/modules
 #
 # This core-update need a reboot
 /usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"