kernel: use 3.2.x as default kernel.

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

diff --git a/lfs/xen-image b/lfs/xen-image
index 63c7b3e46b55e72b75c793e52a29c06dc8c927ba..3bfeb11c516650e097b83ce62011f7f3109ceb68 100644 (file)
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -29,6 +29,8 @@ VER = ipfire
 THISAPP    = xen-image
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+KVER = `grep "^VER " $(DIR_SRC)/lfs/linux2 | sed "s| ||g" | cut -d"=" -f2`
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +46,7 @@ md5 :
 ###############################################################################
 # Installation Details
 ###############################################################################
-IMGinst  := /install/images/$(SNAME)-$(VERSION).xen.$(MACHINE)-$(ED)-core$(CORE).tar.bz2
+IMGinst  := /install/images/$(SNAME)-$(VERSION).xen.$(MACHINE)-full-core$(CORE).tar.bz2
 MNThdd   := /install/harddisk
 
 IMGboot  := /install/images/$(SNAME)/$(SNAME)-boot.img
@@ -63,7 +65,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 +88,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
@@ -115,7 +117,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
        echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
        touch $(MNThdd)/lib/modules/$(KVER)-ipfire-xen/modules.dep
-       mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname
        mkdir $(MNThdd)/proc
        mount --bind /proc $(MNThdd)/proc
        mount --bind /dev  $(MNThdd)/dev
@@ -127,25 +128,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
@@ -167,10 +156,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
@@ -188,6 +173,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)