###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2013 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 \
+ [ -e /dev/loop$${i} ] || continue; \
if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
LOOPDEV="/dev/loop$${i}"; \
break; \
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 && \
- cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/mnt/syslinux.cfg && \
+ mv /install/mnt/boot/isolinux /install/mnt/boot/syslinux && \
+ mv /install/mnt/boot/syslinux/isolinux.cfg \
+ /install/mnt/boot/syslinux/syslinux.cfg && \
umount /install/mnt && \
losetup -d $$LOOPDEV && \
syslinux $$IMAGE
# 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)
COUNT=$$((`du -k -s $(IMGfs) | awk '{print $$1}'` + 32 )); \
dd bs=1k if=/dev/zero of=$(IMGhdd) count=$$COUNT
# write mbr before partitioning save a 'not msdos fs' warning from sfdisk
- /usr/local/sbin/install-mbr -f $(IMGhdd)
+ /usr/sbin/install-mbr -f $(IMGhdd)
echo -e "0,,6,*\n;\n;\n;" | sfdisk -qLD -H 64 -S 32 $(IMGhdd)
# copy the entire partition, make the fs and dd back
dd if=$(IMGfs) of=$(IMGhdd) bs=512 seek=32