[git.ipfire.org] IPFire 2.x development tree branch, core90, updated. 9d05aa770ae2ee6b34c0a0921f83b7c4663b9af3

[git.ipfire.org] IPFire 2.x development tree branch, core90, updated. 9d05aa770ae2ee6b34c0a0921f83b7c4663b9af3

[git]

[-- Attachment #1: Type: text/plain, Size: 4433 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core90 has been updated
       via  9d05aa770ae2ee6b34c0a0921f83b7c4663b9af3 (commit)
       via  888726854ff409a6f57b01592083eb6256d65250 (commit)
      from  5f51d10373a8224027a14c055ec87e3109d58511 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9d05aa770ae2ee6b34c0a0921f83b7c4663b9af3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed May 20 11:03:42 2015 +0200

    core90: fix grub.cfg update on xen hvm installations.

commit 888726854ff409a6f57b01592083eb6256d65250
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed May 20 11:00:12 2015 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/90/update.sh | 19 +++---------------
 lfs/linux                          |  2 +-
 src/paks/linux-pae/install.sh      | 41 +++++++++++++++++---------------------
 3 files changed, 22 insertions(+), 40 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index fa67f6b..34dacf1 100644
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -225,22 +225,9 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
 	/etc/init.d/ipsec start
 fi
 
-case "$(uname -m)" in
-	i?86)
-	case "$(find_device "/")" in
-		xvd* )
-			echo Skip remove grub2 files, because pygrub fail.
-			rm -f /boot/grub/*
-			echo config will recreated by linux-pae install.
-			;;
-		* )
-			#
-			# Update to GRUB2 config
-			#
-			grub-mkconfig > /boot/grub/grub.cfg
-			;;
-	esac
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+		grub-mkconfig > /boot/grub/grub.cfg
+fi
 
 # Upadate Kernel version uEnv.txt
 if [ -e /boot/uEnv.txt ]; then
diff --git a/lfs/linux b/lfs/linux
index b2d2552..bd8a075 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 c980a01..27e665f 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


hooks/post-receive
--
IPFire 2.x development tree