xen-image: fix firstrun.

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

diff --git a/lfs/xen-image b/lfs/xen-image
index ffa1681cc6aae2b2acd779075629d23526fa9a1e..caef9725fcff60332758f086cf6a0d4ecff37829 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -63,7 +63,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        #Create bootimage
        dd bs=1M if=/dev/zero of=$(IMGboot) count=$(SIZEboot)
-       mkfs.ext3 -F $(IMGboot)
+       mkfs.ext2 -F $(IMGboot)
 
        #Create swapimage
        dd bs=1M if=/dev/zero of=$(IMGswap) count=$(SIZEswap)
@@ -86,7 +86,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mount -o loop $(IMGvar) $(MNThdd)/var
 
        # Install IPFire without kernel modules
-       tar -C $(MNThdd)/ -xvjf /install/cdrom/$(SNAME)-$(VERSION).tbz2 \
+       tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma \
                --exclude=lib/modules* --exclude=boot*
 
        #Install Xen Kernel
@@ -127,25 +127,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -i -e "s|DEVICE4|/dev/xvda4|g" $(MNThdd)/etc/fstab
 
        sed -i -e "s|FSTYPE|ext3|g" $(MNThdd)/etc/fstab
-       cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org
-       sed -i -e "s| autodetect | |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
-       echo "rm -f /etc/rc.d/rcsysinit.d/S75firstsetup \\" >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
-       echo "&& /sbin/reboot"                              >> $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
-       chmod +x $(MNThdd)/etc/rc.d/rcsysinit.d/S75firstsetup
+       chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen
 
        #Remove root / fstab check
        rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S19checkfstab
+       #Remove console init
+       rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S70console
 
        #Add xvc0 to securetty
        echo xvc0 >> $(MNThdd)/etc/securetty