Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / src / paks / linux-xen / install.sh

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index d566405a063f64ee354d8732185f479d94fcff3a..70efa9db7e4b8016a9794ab6a78ab48a9a08ae28 100644 (file)
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.26
+KVER=xxxKVERxxx
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then
@@ -51,8 +51,8 @@ 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 "  kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 console=xvc0 $MOUNT" >> /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
 #
@@ -62,7 +62,7 @@ uname -r | grep "ipfire-xen";
 if [ ${?} = 0 ]; then
        #Xen Kernel is active
        #Set grub default entry to this kernel
-       sed -i -e "s|^default saved|default $ENTRY|g" /boot/grub/grub.conf
+       sed -i -e "s|^default .*|default $ENTRY|g" /boot/grub/grub.conf
        #Remove ramdisk of normal kernel (not enough space)
        rm -f /boot/ipfirerd-$KVER.img
 else