X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fxen-image;h=caef9725fcff60332758f086cf6a0d4ecff37829;hp=bd21aac0bda008fb630a0b689092264814f79143;hb=119ec0c656ba9058c7a7085a05a50fbd0f9b1b79;hpb=f359a46eb9edd4b2047fe0a803c52fa872647b1a diff --git a/lfs/xen-image b/lfs/xen-image index bd21aac0bd..caef9725fc 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -47,14 +47,23 @@ md5 : IMGinst := /install/images/$(SNAME)-$(VERSION).xen.$(MACHINE)-$(ED)-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 + 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) @@ -64,14 +73,20 @@ $(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 @@ -81,12 +96,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) #Create grub menuentry for pygrub mkdir $(MNThdd)/boot/grub - echo "title IPFire (XEN-Kernel)" > $(MNThdd)/boot/grub/grub.conf - echo " root(hd0,0)" >> $(MNThdd)/boot/grub/grub.conf - echo " kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 ro" \ + 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" \ >> $(MNThdd)/boot/grub/grub.conf echo " initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf - echo " savedefault 1" >> $(MNThdd)/boot/grub/grub.conf + echo "# savedefault 0" >> $(MNThdd)/boot/grub/grub.conf + ln -s grub.conf $(MNThdd)/boot/grub/menu.lst #Copy the meta-info of linux-xen package @@ -104,35 +121,27 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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-$(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 + #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 @@ -151,10 +160,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(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 + #cp -f $(MNThdd)/boot/ipfirerd-$(KVER)-xen.img \ + # /install/images/$(SNAME)/boot + #cp -f $(MNThdd)/boot/vmlinuz-$(KVER)-ipfire-xen \ + # /install/images/$(SNAME)/boot cp $(DIR_SRC)/config/xen-image/* \ /install/images/$(SNAME) sed -i -e "s|KVER|$(KVER)|g" /install/images/$(SNAME)/ipfire.cfg @@ -163,8 +172,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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)