###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2017 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 #
PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
ifeq "$(SCON)" "1"
- IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
+ IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4-scon.$(BUILD_ARCH)-full-core$(CORE).img.gz
else
- IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
+ IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz
endif
FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
endif
# /boot: 64MB - OFFSET
-# / : 850MB
+# / : 1200 MB
S_BOOT := $(shell echo $$(( 131072 - $(S_OFFSET) )))
-S_ROOT := 1740800
+S_ROOT := 2477600
PADDING = 100 # MB
# Write Partition table
echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \
- | sfdisk -D -uS -H 64 -S 32 $(DEVICE)
+ | sfdisk -uS $(DEVICE)
+ -echo -e "d\n2\nw\n\q\n" | fdisk $(DEVICE)
kpartx -v -a $(DEVICE)
# Install IPFire
ifneq "$(BUILD_PLATFORM)" "arm"
- tar -x --lzma -C $(MNThdd)/ -f /install/cdrom/distro.img
+ tar -x --xz -C $(MNThdd)/ -f /install/cdrom/distro.img
else
tar -x -C $(MNThdd)/ -f /install/cdrom/distro.img
endif