xen-image: use dracut to build initrd.

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

diff --git a/lfs/xen-image b/lfs/xen-image
index 63c7b3e46b55e72b75c793e52a29c06dc8c927ba..09e767114a82ff15e95e065030cfeb8a7ecff642 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,14 +127,8 @@ $(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
+       chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen
 
 
        # Create a script for rebuild-initrd and setup
@@ -146,6 +140,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        #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
@@ -188,6 +184,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        umount $(MNThdd)/boot
        umount $(MNThdd)
 
+       # Zerofree ext3 images to get better compression
+       zerofree $(IMGboot)
+       zerofree $(IMGroot)
+       zerofree $(IMGvar)
+
        # Compress Image
        cd /install/images/ && tar -cvjf $(IMGinst) $(SNAME)