X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fxen-image;h=caef9725fcff60332758f086cf6a0d4ecff37829;hb=5bfa669faa0c522692ec8e3a7f9356c0a8b57615;hp=63c7b3e46b55e72b75c793e52a29c06dc8c927ba;hpb=3c00493401b18a5a0a7bbda97659f29e1b70af2b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/xen-image b/lfs/xen-image
index 63c7b3e46b..caef9725fc 100644
--- 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
@@ -188,6 +176,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)