Fix merge conflicts

export-image/00-allow-rerun/00-run.sh

@@ -1,13 +1,5 @@
 #!/bin/bash -e
 
-if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then
-	mv ${ROOTFS_DIR}/etc/ld.so.preload ${ROOTFS_DIR}/etc/ld.so.preload.disabled
-fi
-
-if [ ! -e ${ROOTFS_DIR}/usr/sbin/policy-rc.d ]; then
-	install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/
-fi
-
 if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then
 	cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
 fi

export-image/04-finalise/01-run.sh

@@ -13,13 +13,7 @@ if [ -d ${ROOTFS_DIR}/home/pi/.config ]; then
 fi
 
 rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
-rm -f ${ROOTFS_DIR}/usr/sbin/policy-rc.d
 rm -f ${ROOTFS_DIR}/usr/bin/qemu-arm-static
-if [ "${USE_QEMU}" != "1" ]; then
-	if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then
-		mv ${ROOTFS_DIR}/etc/ld.so.preload.disabled ${ROOTFS_DIR}/etc/ld.so.preload
-	fi
-fi
 
 rm -f ${ROOTFS_DIR}/etc/apt/sources.list~
 rm -f ${ROOTFS_DIR}/etc/apt/trusted.gpg~

export-image/prerun.sh

@@ -13,7 +13,8 @@ BOOT_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 | cut
 TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 | cut -f 1)
 
 ROUND_SIZE="$((4 * 1024 * 1024))"
-IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE))
+ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))
+IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE))
 
 truncate -s ${IMG_SIZE} ${IMG_FILE}
 fdisk -H 255 -S 63 ${IMG_FILE} <<EOF
@@ -29,7 +30,7 @@ c
 n
 
 
-8192
+${ROUNDED_ROOT_SECTOR}
 
 
 p

stage1/01-sys-tweaks/00-run.sh

@@ -2,7 +2,6 @@
 
 install -d ${ROOTFS_DIR}/etc/systemd/system/[email protected]
 install -m 644 files/noclear.conf ${ROOTFS_DIR}/etc/systemd/system/[email protected]/noclear.conf
-install -m 744 files/policy-rc.d ${ROOTFS_DIR}/usr/sbin/policy-rc.d #TODO: Necessary in systemd?
 install -v -m 644 files/fstab ${ROOTFS_DIR}/etc/fstab
 
 on_chroot << EOF

stage2/01-sys-tweaks/01-run.sh

@@ -21,14 +21,6 @@ EOF
 if [ "${USE_QEMU}" = "1" ]; then
 	echo "enter QEMU mode"
 	install -m 644 files/90-qemu.rules		${ROOTFS_DIR}/etc/udev/rules.d/
-	if [ -e ${ROOTFS_DIR}/etc/ld.so.preload.disabled ]; then
-		rm ${ROOTFS_DIR}/etc/ld.so.preload.disabled
-		touch ${ROOTFS_DIR}/etc/ld.so.preload.disabled
-	fi
-	if [ -e ${ROOTFS_DIR}/etc/ld.so.preload ]; then
-		rm ${ROOTFS_DIR}/etc/ld.so.preload
-		touch ${ROOTFS_DIR}/etc/ld.so.preload
-	fi
 	on_chroot << EOF
 systemctl disable resize2fs_once
 EOF

stage2/02-net-tweaks/files/wpa_supplicant.conf

@@ -1,3 +1,2 @@
-country=GB
 ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
 update_config=1