# Add new Entry to grub.conf
#
echo "" >> /boot/grub/grub.conf
-echo "title IPFire Xen-Kernel:$KVER" >> /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 "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";
+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
#
+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