# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# Copyright (C) 2010 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
#
-KVER=2.6.27.31
+KVER=2.6.32.23
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
#
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
+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
+ #Remove ramdisk of normal kernel (not enough space)
+ rm -f /boot/ipfirerd-$KVER.img
+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