X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fxen-image;h=1c2624e2e705e391cd629568e24da699279abb4a;hb=dcee88ba68ca5910bdef8b9e6f820dd8c003b2e0;hp=5f171c448586de382f01d533e8e3fd65edff7b32;hpb=aa7304005c3d1c045039e0e4a3f8d4aefcaab86f;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/lfs/xen-image b/lfs/xen-image index 5f171c448..1c2624e2e 100644 --- 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 # # # # 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,18 +46,27 @@ 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 -IMGroot := /install/images/$(SNAME)/$(SNAME).img -IMGswap := /install/images/$(SNAME)/swap.img -SIZEroot := 1024 +IMGboot := /install/images/$(SNAME)/$(SNAME)-boot.img +IMGswap := /install/images/$(SNAME)/$(SNAME)-swap.img +IMGroot := /install/images/$(SNAME)/$(SNAME)-root.img +IMGvar := /install/images/$(SNAME)/$(SNAME)-var.img + +SIZEboot := 30 SIZEswap := 512 +SIZEroot := 512 +SIZEvar := 950 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) rm -rf $(MNThdd) $(IMGinst) $(IMGroot) && mkdir -p $(MNThdd) mkdir -p /install/images/$(SNAME) # /boot + #Create bootimage + dd bs=1M if=/dev/zero of=$(IMGboot) count=$(SIZEboot) + mkfs.ext2 -F $(IMGboot) + #Create swapimage dd bs=1M if=/dev/zero of=$(IMGswap) count=$(SIZEswap) mkswap $(IMGswap) @@ -64,76 +75,87 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot) mkfs.ext3 -F $(IMGroot) + #Create varimage + dd bs=1M if=/dev/zero of=$(IMGvar) count=$(SIZEvar) + mkfs.ext3 -F $(IMGvar) + # Mount Images mount -o loop $(IMGroot) $(MNThdd) mkdir $(MNThdd)/boot mkdir $(MNThdd)/var mkdir $(MNThdd)/var/log + mount -o loop $(IMGboot) $(MNThdd)/boot + 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 - 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/* #Create grub menuentry for pygrub mkdir $(MNThdd)/boot/grub - echo "default 1" > $(MNThdd)/boot/grub/grub.conf - echo "title IPFire (XEN-Kernel)" >> $(MNThdd)/boot/grub/grub.conf - echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 console=xvc0 ro" \ + echo "timeout 10" > $(MNThdd)/boot/grub/grub.conf + echo "default 0" >> $(MNThdd)/boot/grub/grub.conf + 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 mount --bind /sys $(MNThdd)/sys chroot $(MNThdd) /usr/bin/perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - sed -i -e "s|DEVICE1|#boot-disabled|g" $(MNThdd)/etc/fstab - sed -i -e "s|DEVICE2|/dev/xvdb1|g" $(MNThdd)/etc/fstab - sed -i -e "s|DEVICE3|/dev/xvda1|g" $(MNThdd)/etc/fstab - sed -i -e "s|DEVICE4|#var-disabled|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE1|/dev/xvda1|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE2|/dev/xvda2|g" $(MNThdd)/etc/fstab + sed -i -e "s|DEVICE3|/dev/xvda3|g" $(MNThdd)/etc/fstab + 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-$(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 + #Remove console init + rm -rf $(MNThdd)/etc/rc.d/rcsysinit.d/S70console #Add xvc0 to securetty echo xvc0 >> $(MNThdd)/etc/securetty + #Add getty for xvc0 + echo "#Enable login for XEN" >> $(MNThdd)/etc/inittab + echo "8:2345:respawn:/sbin/agetty xvc0 9600" >> $(MNThdd)/etc/inittab + #Disable some initskripts echo "#!/bin/sh" > $(MNThdd)/etc/rc.d/init.d/setclock echo "#!/bin/sh" > $(MNThdd)/etc/rc.d/init.d/keymap @@ -147,25 +169,23 @@ $(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 umount $(MNThdd)/dev umount $(MNThdd)/sys + umount $(MNThdd)/var + 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)