From d876f9c3239488016ac21f16604ad49dfbcea6c2 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 Sep 2009 17:00:03 +0200
Subject: [PATCH 1/3] pygrub doesnt like some grub configuration parameters

---
 lfs/xen-image                 |  7 +++----
 src/paks/linux-xen/install.sh | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lfs/xen-image b/lfs/xen-image
index bd21aac0b..bb7449272 100644
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -81,12 +81,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	#Create grub menuentry for pygrub
 	mkdir $(MNThdd)/boot/grub
-	echo "title IPFire (XEN-Kernel)"           > $(MNThdd)/boot/grub/grub.conf
-	echo "  root(hd0,0)"                      >> $(MNThdd)/boot/grub/grub.conf
-	echo "  kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 ro" \
+	echo "default 1"                           > $(MNThdd)/boot/grub/grub.conf
+	echo "title IPFire (XEN-Kernel)"          >> $(MNThdd)/boot/grub/grub.conf
+	echo "  kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 console=xvc0 ro" \
 						  >> $(MNThdd)/boot/grub/grub.conf
 	echo "  initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
-	echo "  savedefault 1"                    >> $(MNThdd)/boot/grub/grub.conf
 	ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
 
 	#Copy the meta-info of linux-xen package
diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 38daf4027..1877e7f0a 100644
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -43,10 +43,21 @@ 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
+#
+# 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
 #

From 8f836b573e152c58be51117338ac415e6451b20e Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 Sep 2009 17:04:42 +0200
Subject: [PATCH 2/3] Fix missing rw/ro mount parameter on ct'server update

---
 config/rootfiles/core/31/update.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/rootfiles/core/31/update.sh b/config/rootfiles/core/31/update.sh
index 1780a1325..87cc51923 100644
--- a/config/rootfiles/core/31/update.sh
+++ b/config/rootfiles/core/31/update.sh
@@ -30,6 +30,9 @@ MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
 MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+	MOUNT="ro"
+fi
 #
 # check if we the backup file already exist
 if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then

From d10bbeba71d2f2ba574e184c181d9f8ea5cc1696 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 Sep 2009 17:09:56 +0200
Subject: [PATCH 3/3] Fix typo

---
 src/paks/linux-xen/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 1877e7f0a..b2c8f383e 100644
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -52,11 +52,11 @@ 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
 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