From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 20 May 2015 09:00:12 +0000 (+0200)
Subject: linux-pae: fix grub entry for xen hvm machines.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=888726854ff409a6f57b01592083eb6256d65250;p=people%2Fms%2Fipfire-2.x.git

linux-pae: fix grub entry for xen hvm machines.
---

diff --git a/lfs/linux b/lfs/linux
index b2d2552dc8..bd8a0758b4 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 59
+PAK_VER    = 60
 DEPS	   = ""
 
 VERSUFIX=ipfire$(KCFG)
diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index c980a0136b..27e665f924 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -55,29 +55,24 @@ depmod -a $KVER-ipfire-pae
 #
 /usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
-
-ROOT="$(find_partition "/")"
-case $ROOT in
-	xvd* )
-		#
-		# We are on XEN so create new grub.conf / menu.lst for pygrub
-		#
-		echo "timeout 10"                          > /boot/grub/grub.conf
-		echo "default 0"                          >> /boot/grub/grub.conf
-		echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
-		echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
-							  >> /boot/grub/grub.conf
-		echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
-		echo "# savedefault 0"			  >> /boot/grub/grub.conf
-		ln -s grub.conf $MNThdd/boot/grub/menu.lst
-		;;
-	* )
-		#
-		# Update grub2 config
-		#
-		grub-mkconfig > /boot/grub/grub.cfg
-		;;
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+	#
+	# Update grub2 config
+	#
+	grub-mkconfig > /boot/grub/grub.cfg
+else
+	#
+	# xen pv with pygrub need grub.conf / menu.lst
+	#
+	echo "timeout 10"                          > /boot/grub/grub.conf
+	echo "default 0"                          >> /boot/grub/grub.conf
+	echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
+	echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
+						  >> /boot/grub/grub.conf
+	echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
+	echo "# savedefault 0"			  >> /boot/grub/grub.conf
+	ln -s grub.conf $MNThdd/boot/grub/menu.lst
+fi
 
 # request a reboot if pae is supported
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then