From: Jan Paul Tuecking <earl@ipfire.org>
Date: Wed, 23 Jun 2010 15:47:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~195
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=fa3844657695ee2891ef1b483981deb66124f149;hp=083c56c7950c5f9ced484c7ef8d8372164a12981

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
---

diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh
index 8882021643..1c65373fc6 100644
--- a/config/rootfiles/core/38/update.sh
+++ b/config/rootfiles/core/38/update.sh
@@ -116,9 +116,8 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
 	--no-overwrite-dir
 #
-# Start Sevices
+# Start sysklogd
 /etc/init.d/sysklogd start
-/etc/init.d/squid start
 #
 # Modify grub.conf
 #
@@ -267,6 +266,9 @@ echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot...
 chmod +x /tmp/pak_update
 /tmp/pak_update &
 #
+# Start squid
+/etc/init.d/squid start
+#
 echo
 echo Please wait until pakfire has ended...
 echo