This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via d2d2da1038f20022a7f56f687b4fc1db4049c67b (commit) from 4849218f8fc1ac85090dfe389daeeda39936fedb (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit d2d2da1038f20022a7f56f687b4fc1db4049c67b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 26 21:35:17 2010 +0200

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

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/38/update.sh | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 9a95149..716c6a5 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"

hooks/post-receive -- IPFire 2.x development tree