###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2010 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 #
###############################################################################
# Installation Details
###############################################################################
-IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE).img
-IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE).img
+IMGfdd := /install/images/$(SNAME)-$(VERSION)-install-usb-fdd.$(MACHINE)-full-core$(CORE).img
+IMGhdd := /install/images/$(SNAME)-$(VERSION)-install-usb-hdd.$(MACHINE)-full-core$(CORE).img
IMGfs := /install/images/fs
+DISKSIZE=120000
+
define COPY_TO_IMG
mkdosfs -n IPFIRE -F 16 -I $$IMAGE && \
for i in /0 `seq 0 7`; do \
losetup $$LOOPDEV $$IMAGE && \
mount -t vfat $$LOOPDEV /install/mnt && \
cp -fR /install/cdrom/* /install/mnt && \
- mv /install/mnt/boot/isolinux/{instroot,vmlinuz,*\.msg,memtest} /install/mnt && \
- rm -rf /install/mnt/boot && \
+ mv /install/mnt/boot/isolinux/{instroot,vmlinuz,splash.lss,*\.msg,memtest} /install/mnt && \
+ rm -rf /install/mnt/boot/isolinux && \
cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
umount /install/mnt && \
losetup -d $$LOOPDEV && \
# Partitionned images : make a file system bigger than iso size
# that fit on 128MB key to let free space available
# on the unique partition. Image will be compressed later
- dd bs=1k if=/dev/zero of=$(IMGfs) count=120000
+ dd bs=1k if=/dev/zero of=$(IMGfs) count=$(DISKSIZE)
IMAGE=$(IMGfs); $(COPY_TO_IMG)
# usb-hdd (64 heads, 32 sectors geometry, on a partition 1)