Merge branch 'master' into perl_5.12.2

This commit is contained in:
Arne Fitzenreiter
2011-01-29 21:38:06 +01:00
3 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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