X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fpaks%2Flinux-xen%2Finstall.sh;h=5092923daff8a4eca1083ff906cb8582ab3647d9;hp=b2c8f383e5a6f934b5ad2545e396dc3f468df331;hb=98c1a5739f9a909d0d262e27d8e0cc7f11d3b32c;hpb=d10bbeba71d2f2ba574e184c181d9f8ea5cc1696

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index b2c8f383e5..5092923daf 100644
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -17,14 +17,14 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.27.31
+KVER=2.6.32.23
 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
@@ -45,26 +45,27 @@ 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 "  initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
+echo "# savedefault $ENTRY" >> /boot/grub/grub.conf
 #
 # Test if we running already on xen
 #
-uname -r ¦ grep "ipfire-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
+	sed -i -e "s|^default saved|default $ENTRY|g" /boot/grub/grub.conf
+	#Remove ramdisk of normal kernel (not enough space)
+	rm -f /boot/ipfirerd-$KVER.img
 else
 	#Normal Kernel
 	#pygrub crash with "default saved"
-	sed -i -e "s¦^default saved¦#default saved¦g" /boot/grub/grub.conf
+	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