X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fflash-images;h=1a7134d380903cc846d1a233fb68ca1a5e754cbe;hp=fb1ca3da9902435704c0876b7273782b81346740;hb=7284262a5e94fa4cc15742fa7c7a3a0252d9e9ee;hpb=84aed1ea54ea5e482d3e7dcd7075188062ae85b1

diff --git a/lfs/flash-images b/lfs/flash-images
index fb1ca3da9..1a7134d38 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -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        #
@@ -44,28 +44,25 @@ md5 :
 ###############################################################################
 # Installation Details
 ###############################################################################
-IMGinst  := /install/images/$(SNAME)-$(VERSION).1gb-ext2.$(MACHINE)-full-core$(CORE).img
-IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext2-scon.$(MACHINE)-full-core$(CORE).img
+IMGinst  := /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(MACHINE)-full-core$(CORE).img
+IMGinsts := /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(MACHINE)-full-core$(CORE).img
 MNThdd   := /install/harddisk
 IMGpart  := /install/images/part_area
 IMGboot  := /install/images/bootfs
 # don't change SIZEboot this without checking Image size
-SIZEboot := 20
+SIZEboot := 64
 IMGroot  := /install/images/rootfs
-SIZEroot := 500
-IMGvar   := /install/images/varfs
-SIZEvar  := 430
+SIZEroot := 600
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) && mkdir -p $(MNThdd)
+	rm -rf $(MNThdd) $(IMGinst) $(IMGpart) $(IMGboot) $(IMGroot) && mkdir -p $(MNThdd)
 
 	# Create first 32 sectors of image
 	dd bs=1k if=/dev/zero of=$(IMGpart) count=16
 
 	# Create images for filesystems
-	dd bs=1K if=/dev/zero of=$(IMGboot) count=20464  # 20MB-16K
+	dd bs=1K if=/dev/zero of=$(IMGboot) count=65520  # 64MB-16K
 	dd bs=1M if=/dev/zero of=$(IMGroot) count=$(SIZEroot)
-	dd bs=1M if=/dev/zero of=$(IMGvar) count=$(SIZEvar)
 
 	# Format them
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -73,8 +70,11 @@ ifeq "$(MACHINE_TYPE)" "arm"
 else
 	mkfs.ext2 -F $(IMGboot)
 endif
-	mkfs.ext2 -F $(IMGroot)
-	mkfs.ext2 -F $(IMGvar)
+	mkfs.ext4 -O ^has_journal,extent -F $(IMGroot)
+
+	# Most systems that use Flashimages has no RTC at boot
+	# so the interval check should disables
+	tune2fs -i0 $(IMGroot)
 
 	# Mount Images
 	mount -o loop $(IMGroot) $(MNThdd)
@@ -82,7 +82,15 @@ endif
 	mkdir $(MNThdd)/var
 	mkdir $(MNThdd)/var/log
 	mount -o loop $(IMGboot) $(MNThdd)/boot
-	mount -o loop $(IMGvar)  $(MNThdd)/var
+
+	# Install MLO and uboot first
+ifeq "$(MACHINE_TYPE)" "arm"
+	cp -v /boot/MLO $(MNThdd)/boot/
+	cp -v /boot/u-boot.img $(MNThdd)/boot/
+	sync
+	umount $(MNThdd)/boot
+	mount -o loop $(IMGboot) $(MNThdd)/boot
+endif
 
 	# Install IPFire
 	tar -C $(MNThdd)/ -xvaf /install/cdrom/$(SNAME)-$(VERSION).tlz
@@ -90,7 +98,6 @@ endif
 	echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
 	echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
 	-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
-	mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname
 	mkdir $(MNThdd)/proc
 	mount --bind /proc $(MNThdd)/proc
 	mount --bind /dev  $(MNThdd)/dev
@@ -103,8 +110,8 @@ ifeq "$(MACHINE_TYPE)" "arm"
 endif
 	sed -i -e "s|DEVICE2|#DEVICE2|g" $(MNThdd)/etc/fstab
 	sed -i -e "s|DEVICE3|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
-	sed -i -e "s|DEVICE4|UUID=$$(blkid -sUUID $(IMGvar) | cut -d'"' -f2)|g" $(MNThdd)/etc/fstab
-	sed -i -e "s|FSTYPE|ext2|g" $(MNThdd)/etc/fstab
+	sed -i -e "s|DEVICE4|#DEVICE4|g" $(MNThdd)/etc/fstab
+	sed -i -e "s|FSTYPE|ext4|g" $(MNThdd)/etc/fstab
 
 ifneq "$(MACHINE_TYPE)" "arm"
 	sed -i -e "s|MOUNT|ro|g" $(MNThdd)/boot/grub/grub.conf
@@ -113,29 +120,42 @@ ifneq "$(MACHINE_TYPE)" "arm"
 	ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
 
 	# Copy grub files manually
-	cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/
+	cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/
 endif
 
+	# Setup symlink for partresize at first boot...
+	ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize
+	# Setup symlink for fsresize at second boot...
+	ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S42fsresize
+
 	# Unmount
 	umount $(MNThdd)/proc
 	umount $(MNThdd)/dev
 	umount $(MNThdd)/sys
 	umount $(MNThdd)/boot
-	umount $(MNThdd)/var
 	umount $(MNThdd)
 
-	# zerofree the ext3 images to get better compression
+	# zerofree the ext2 images to get better compression
 ifneq "$(MACHINE_TYPE)" "arm"
 	zerofree $(IMGboot)
+	-fsck.ext2 -f -y $(IMGboot)
+	fsck.ext2 -f -y $(IMGboot)
 endif
 	zerofree $(IMGroot)
-	zerofree $(IMGvar)
+	-fsck.ext4 -f -y  $(IMGroot)
+	fsck.ext4 -f -y  $(IMGroot)
 
 	# Cat to an image
-	cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinst)
+	cat $(IMGpart) $(IMGboot) $(IMGroot) > $(IMGinst)
+
 	# Write Partition table
-	echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \
+ifneq "$(MACHINE_TYPE)" "arm"
+	echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \
 		| sfdisk -D -uM -H 64 -S 32 $(IMGinst)
+else
+	echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \
+		| sfdisk -D -uM -H 64 -S 32 $(IMGinst)
+endif
 
 ifneq "$(MACHINE_TYPE)" "arm"
 	# Install grub
@@ -160,6 +180,10 @@ ifneq "$(MACHINE_TYPE)" "arm"
 	sed -i -e "s|#serial|serial|g" $(MNThdd)/boot/grub/grub.conf
 	sed -i -e "s|#terminal|terminal|g" $(MNThdd)/boot/grub/grub.conf
 	sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" $(MNThdd)/boot/grub/grub.conf
+else
+	sed -i -e "s| console=tty1 | console=ttyAMA0,115200n8 |g" $(MNThdd)/boot/cmdline.txt
+	sed -i -e "s| console=tty1 | console=ttyO2,115200n8 |g" $(MNThdd)/boot/boot.script
+	cd $(MNThdd)/boot && ./convert_bootscript
 endif
 
 	sed -i -e "s|1:2345:respawn:|#1:2345:respawn:|g" $(MNThdd)/etc/inittab
@@ -176,16 +200,25 @@ endif
 	# zerofree the ext3 images to get better compression
 ifneq "$(MACHINE_TYPE)" "arm"
 	zerofree $(IMGboot)
+	-fsck.ext2 -f -y  $(IMGboot)
+	fsck.ext2 -f -y  $(IMGboot)
 endif
 	zerofree $(IMGroot)
-	zerofree $(IMGvar)
+	-fsck.ext4 -f -y  $(IMGroot)
+	fsck.ext4 -f -y  $(IMGroot)
 
 	# Cat to an image
-	cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinsts)
-	rm -vf $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar)
+	cat $(IMGpart) $(IMGboot) $(IMGroot) > $(IMGinsts)
+	rm -vf $(IMGpart) $(IMGboot) $(IMGroot)
+
 	# Write Partition table
-	echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,$(SIZEvar),L\n" \
+ifneq "$(MACHINE_TYPE)" "arm"
+	echo -e ",$(SIZEboot),L,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \
+		| sfdisk -D -uM -H 64 -S 32 $(IMGinsts)
+else
+	echo -e ",$(SIZEboot),c,*\n,0,0\n,$(SIZEroot),L\n,0,0\n" \
 		| sfdisk -D -uM -H 64 -S 32 $(IMGinsts)
+endif
 
 ifneq "$(MACHINE_TYPE)" "arm"
 	# Install grub
@@ -200,5 +233,4 @@ endif
 	# Compress Image
 	gzip -f9 $(IMGinsts)
 
-	rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar)
-
+	rm -rf $(MNThdd) $(IMGpart) $(IMGboot) $(IMGroot)