# 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
#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
#
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
#