Updated Kernel (2.6.32.10).

[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 38daf4027566ab0a8565884fcd4ac55416c62b5e..539c2fa8d881d33fdb9c85851f31c0bf09cc25d3 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.27.31
+KVER=2.6.32.10
 ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
@@ -43,17 +43,27 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
 #
 echo "" >> /boot/grub/grub.conf
 echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf
-echo "  root (hd0,0)" >> /boot/grub/grub.conf
-echo "  kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf
+echo "  kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 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
+echo "# savedefault $ENTRY" >> /boot/grub/grub.conf
+#
+# Test if we running already on xen
+#
+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
+else
+       #Normal Kernel
+       #pygrub crash with "default saved"
+       sed -i -e "s|^default saved|#default saved|g" /boot/grub/grub.conf
+fi
 #
 # Made initramdisk
 #
 cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
 sed -i -e "s| autodetect | |g" /etc/mkinitcpio.conf
-# Remove Reiser4 (not working with xen)
-sed -i -e "s|reiser4 | |g" /etc/mkinitcpio.conf
 mkinitcpio -k $KVER-ipfire-xen -g /boot/ipfirerd-$KVER-xen.img
 #
 # Create new module depency