From 50dce8e3b32d1409e40458a429485044b1f1bc60 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Mon, 20 Aug 2012 10:44:57 -0500 Subject: [PATCH] debian: move e2fsck.conf to chroot script Signed-off-by: Robert Nelson --- mk_mmc.sh | 1 - scripts/debian-finish.sh | 6 ++++++ scripts/debian-tweaks.diff | 3 +-- scripts/e2fsck.conf | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 scripts/e2fsck.conf diff --git a/mk_mmc.sh b/mk_mmc.sh index bc3dc33..7d5f576 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -976,7 +976,6 @@ function initrd_preseed_settings { ;; squeeze|wheezy) patch -p1 < "${DIR}/scripts/debian-tweaks.diff" - cp -v "${DIR}/scripts/e2fsck.conf" ${TEMPDIR}/initrd-tree/etc/e2fsck.conf cp -v "${DIR}/scripts/debian-finish.sh" ${TEMPDIR}/initrd-tree/etc/finish-install.sh ;; esac diff --git a/scripts/debian-finish.sh b/scripts/debian-finish.sh index c47b06c..f1c6fb1 100644 --- a/scripts/debian-finish.sh +++ b/scripts/debian-finish.sh @@ -60,3 +60,9 @@ if [ "x${smsc95xx_mem}" != "x" ] ; then echo "vm.min_free_kbytes = ${smsc95xx_mem}" >> /etc/sysctl.conf fi +cat > /etc/e2fsck.conf <<-__EOF__ +[options] + +broken_system_clock = true + +__EOF__ diff --git a/scripts/debian-tweaks.diff b/scripts/debian-tweaks.diff index 48c869d..9273e82 100644 --- a/scripts/debian-tweaks.diff +++ b/scripts/debian-tweaks.diff @@ -3,9 +3,8 @@ new file mode 100755 index 0000000..6d06fc7 --- /dev/null +++ b/usr/lib/finish-install.d/08rcn-ee-finish-installing-device -@@ -0,0 +1,27 @@ +@@ -0,0 +1,26 @@ +#!/bin/sh -e -+cp /etc/e2fsck.conf /target/etc/e2fsck.conf +cp /etc/finish-install.sh /target/etc/finish-install.sh +chmod a+x /target/etc/finish-install.sh + diff --git a/scripts/e2fsck.conf b/scripts/e2fsck.conf deleted file mode 100644 index 82ef314..0000000 --- a/scripts/e2fsck.conf +++ /dev/null @@ -1,4 +0,0 @@ -[options] - -broken_system_clock = true -