Merge branch 'master' into perl_5.12.2

Conflicts:
	config/rootfiles/core/46/filelists/files
	config/rootfiles/core/46/update.sh

diff --combined config/rootfiles/core/46/update.sh
index 38ad3ac3f7f621880312e58db371eb4d0378166a,f178d1013ce750b3a16dd9c5a2b55eabbbd3ea16..4034160d3734d11954bed03477a640b3e09b4d86
--- 1/config/rootfiles/core/46/update.sh
--- 2/config/rootfiles/core/46/update.sh
+++ b/config/rootfiles/core/46/update.sh
@@@ -17,13 -17,16 +17,16 @@@
  # 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>.                        #
  #                                                                          #
  ############################################################################
  #
  . /opt/pakfire/lib/functions.sh
  /usr/local/bin/backupctrl exclude >/dev/null 2>&1
  
+ #
+ # Remove core updates from pakfire cache to save space...
+ rm -f /var/cache/pakfire/core-upgrade-*.ipfire
  #
  #Stop services
  
@@@ -38,10 -41,15 +41,15 @@@ extract_file
  #Update Language cache
  #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
  
+ # Rebuild initrd of optional pae and xen kernel
+ KVER=2.6.32.28
+ [ -e /boot/ipfirerd-$KVER-pae.img ] && /sbin/dracut --force --verbose /boot/ipfirerd-$KVER-pae.img $KVER-ipfire-pae
+ [ -e /boot/ipfirerd-$KVER-xen.img ] && /sbin/dracut --force --verbose /boot/ipfirerd-$KVER-xen.img $KVER-ipfire-xen
+ 
  #Rebuild module dep's
- #depmod 2.6.32.28-ipfire
- #depmod 2.6.32.28-ipfire-pae
- #depmod 2.6.32.28-ipfire-xen
+ depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+ depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+ depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
  
  #
  #Finish