pygrub doesnt like some grub configuration parameters

[people/pmueller/ipfire-2.x.git] / lfs / xen-image

diff --git a/lfs/xen-image b/lfs/xen-image
index 4da844c65384ed08f0e755e69fe927a1c0b4effb..bb744927245e54f093e17fc9a031e66b10007f7d 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -64,8 +64,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot)
        mkfs.ext3 -F $(IMGroot)
 
-       # Mount Images (ext3 mount create a inaccessible ".journal"
-       mount -o loop -t ext2 $(IMGroot) $(MNThdd)
+       # Mount Images
+       mount -o loop $(IMGroot) $(MNThdd)
        mkdir $(MNThdd)/boot
        mkdir $(MNThdd)/var
        mkdir $(MNThdd)/var/log
@@ -79,6 +79,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chroot $(MNThdd) /opt/pakfire/tmp/install.sh
        rm -rf $(MNThdd)/opt/pakfire/tmp/*
 
+       #Create grub menuentry for pygrub
+       mkdir $(MNThdd)/boot/grub
+       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
+       ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
+
+       #Copy the meta-info of linux-xen package
+       cp -f /install/packages/meta-linux-xen $(MNThdd)/opt/pakfire/db/installed
+       cp -f /install/packages/meta-linux-xen $(MNThdd)/opt/pakfire/db/meta
+
        #Set default configuration
        echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
        echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
@@ -99,12 +112,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org
        sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf
 
-       #Remove File System modules because they are included to kernel
-       sed -i -e "s|reiser4 reiserfs ext3| |g" $(MNThdd)/etc/mkinitcpio.conf
+       #Remove reiser4 because it is not work with xen-kernel
+       sed -i -e "s|reiser4 | |g" $(MNThdd)/etc/mkinitcpio.conf
 
        chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen
        cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf
 
+
        # Create a script for rebuild-initrd and setup
        echo "#!/bin/bash"                                   > $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
        echo "/usr/local/sbin/setup /dev/null INSTALL"      >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
@@ -115,6 +129,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        #Remove root / fstab check
        rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S19checkfstab
 
+       #Add xvc0 to securetty
+       echo xvc0 >> $(MNThdd)/etc/securetty
+
+       #Disable some initskripts
+       echo "#!/bin/sh" > $(MNThdd)/etc/rc.d/init.d/setclock
+       echo "#!/bin/sh" > $(MNThdd)/etc/rc.d/init.d/keymap
+
+       #Remove autoload of acpi modules
+       sed -i -e "s|^ac|#ac|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^battery|#battery|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^button|#button|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^fan|#fan|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^processor|#processor|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^thermal|#thermal|g" $(MNThdd)/etc/sysconfig/modules
+       sed -i -e "s|^video|#video|g" $(MNThdd)/etc/sysconfig/modules
+
+       #Change pakfire trunk
+       sed -i -e "s|$(VERSION)|$(VERSION)-xen|g" \
+               $(MNThdd)/opt/pakfire/etc/pakfire.conf
+
        #Copy initramdisk, kernel and config
        cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \
                /install/images/$(SNAME)/boot