Merge branch 'master' into perl_5.12.2

diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder
index 56480dba0101cfe27a8652a6459189f24a2ad44c..49390042348ab03d1a1fc398ea5ccfd3e808505b 100644 (file)
--- a/config/rootfiles/packages/ipfireseeder
+++ b/config/rootfiles/packages/ipfireseeder
@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core44.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core45.iso.torrent
 #var/log/seeder
 var/log/seeder/info

diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder
index 8e7525744009f59f4054ec85d653b280839758fe..4fea43d1b288e2112fa47b1ec820e75bab631b30 100644 (file)
--- a/lfs/ipfireseeder
+++ b/lfs/ipfireseeder
@@ -27,13 +27,13 @@ include Config
 VER        = 1.00
 
 THISAPP    = ipfireseeder-$(VER)
-DL_FILE    = ipfire-2.9.i586-full-core44.iso.torrent
+DL_FILE    = ipfire-2.9.i586-full-core45.iso.torrent
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = ipfireseeder
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = "rtorrent"
 
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 70365fee7ca86b2e059eda81ed804b49
+$(DL_FILE)_MD5 = 3e68353572b67ba3837e15134b124a22
 
 install : $(TARGET)
 

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 80234d0cffdfc378d78744e155b41685229fada0..2015b5d178509e31935a9a2db3d8792e61c77403 100644 (file)
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -51,7 +51,7 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
 # Add new Entry to grub.conf
 #
 echo "" >> /boot/grub/grub.conf
-echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf
+echo "title IPFire (XEN-Kernel $KVER)" >> /boot/grub/grub.conf
 echo "  kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf
 echo "  initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
 echo "# savedefault $ENTRY" >> /boot/grub/grub.conf