Merge branch 'ddns-all-inkl' into next

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

diff --git a/lfs/xen-image b/lfs/xen-image
index 09e767114a82ff15e95e065030cfeb8a7ecff642..1c2624e2e705e391cd629568e24da699279abb4a 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)
 
+KVER2 = `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
@@ -89,8 +91,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        tar -C $(MNThdd)/ -xvf /install/cdrom/$(SNAME)-$(VERSION).tlz --lzma \
                --exclude=lib/modules* --exclude=boot*
 
-       #Install Xen Kernel
-       tar -C $(MNThdd)/opt/pakfire/tmp -xvf /install/packages/linux-xen-$(KVER)-*.ipfire
+       #Install legacy Xen Kernel
+       tar -C $(MNThdd)/opt/pakfire/tmp -xvf /install/packages/linux-xen-$(KVER2)-*.ipfire
+       chroot $(MNThdd) /opt/pakfire/tmp/install.sh
+       rm -rf $(MNThdd)/opt/pakfire/tmp/*
+
+       #Install pae Kernel
+       tar -C $(MNThdd)/opt/pakfire/tmp -xvf /install/packages/linux-pae-$(KVER)-*.ipfire
        chroot $(MNThdd) /opt/pakfire/tmp/install.sh
        rm -rf $(MNThdd)/opt/pakfire/tmp/*
 
@@ -98,24 +105,30 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mkdir $(MNThdd)/boot/grub
        echo "timeout 10"                          > $(MNThdd)/boot/grub/grub.conf
        echo "default 0"                          >> $(MNThdd)/boot/grub/grub.conf
-       echo "title IPFire (XEN-Kernel)"          >> $(MNThdd)/boot/grub/grub.conf
-       echo "  kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
+       echo "title IPFire (legacy XEN-Kernel)"   >> $(MNThdd)/boot/grub/grub.conf
+       echo "  kernel /vmlinuz-$(KVER2)-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
                                                  >> $(MNThdd)/boot/grub/grub.conf
-       echo "  initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
+       echo "  initrd /ipfirerd-$(KVER2)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
        echo "# savedefault 0" >> $(MNThdd)/boot/grub/grub.conf
+       echo "title IPFire (PAE-Kernel)"   >> $(MNThdd)/boot/grub/grub.conf
+       echo "  kernel /vmlinuz-$(KVER)-ipfire-pae root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
+                                                 >> $(MNThdd)/boot/grub/grub.conf
+       echo "  initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
+       echo "# savedefault 1" >> $(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
+       cp -f /install/packages/meta-linux-pae $(MNThdd)/opt/pakfire/db/installed
+       cp -f /install/packages/meta-linux-pae $(MNThdd)/opt/pakfire/db/meta
 
        #Set default configuration
        echo "LANGUAGE=en" >> $(MNThdd)/var/ipfire/main/settings
        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
+       touch $(MNThdd)/lib/modules/$(KVER2)-ipfire-xen/modules.dep
        mkdir $(MNThdd)/proc
        mount --bind /proc $(MNThdd)/proc
        mount --bind /dev  $(MNThdd)/dev
@@ -128,15 +141,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        sed -i -e "s|FSTYPE|ext3|g" $(MNThdd)/etc/fstab
 
-       chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen
-
-
-       # 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-$(KVER2)-xen.img $(KVER2)-ipfire-xen
+       chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-pae.img $(KVER)-ipfire-pae
 
        #Remove root / fstab check
        rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S19checkfstab
@@ -163,18 +169,9 @@ $(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
-       #cp -f $(MNThdd)/boot/vmlinuz-$(KVER)-ipfire-xen \
-       #       /install/images/$(SNAME)/boot
+       # Copy readme and config
        cp $(DIR_SRC)/config/xen-image/* \
                /install/images/$(SNAME)
-       sed -i -e "s|KVER|$(KVER)|g" /install/images/$(SNAME)/ipfire.cfg
 
        # Unmount
        umount $(MNThdd)/proc