From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 20 Feb 2011 16:37:07 +0000 (+0100)
Subject: Merge branch 'master' into perl_5.12.2
X-Git-Tag: v2.9-core48~15^2^2~3
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=4200583c7084c8a048ce9b568bac62a8a4e8bcb1;hp=-c

Merge branch 'master' into perl_5.12.2

Conflicts:
	config/rootfiles/core/47/filelists/files
	config/rootfiles/core/47/update.sh
---

4200583c7084c8a048ce9b568bac62a8a4e8bcb1
diff --combined config/rootfiles/core/46/update.sh
index 4034160d37,6d2a75dc49..95c200c0be
--- a/config/rootfiles/core/46/update.sh
+++ b/config/rootfiles/core/46/update.sh
@@@ -17,7 -17,7 +17,7 @@@
  # along with IPFire; if not, write to the Free Software                    #
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
  #                                                                          #
 -# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
 +# Copyright (C) 2011 IPFire-Team <info@ipfire.org>.                        #
  #                                                                          #
  ############################################################################
  #
@@@ -36,10 -36,11 +36,11 @@@ extract_file
  
  #
  #Start services
+ /etc/init.d/squid restart
  
  #
  #Update Language cache
- #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
  
  # Rebuild initrd of optional pae and xen kernel
  KVER=2.6.32.28
@@@ -53,5 -54,7 +54,7 @@@ depmod 2.6.32.28-ipfire-xen >/dev/null 
  
  #
  #Finish
+ /etc/init.d/fireinfo start
+ sendprofile
  #Don't report the exitcode last command
  exit 0