summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-03-28 03:40:59 +0200
committerDave Reisner <dreisner@archlinux.org>2012-03-28 03:40:59 +0200
commitd397043814a47f0762175a9999a01f3ec0088152 (patch)
tree386314e4a3c5b6932ad4809e343b3729158e11bc
parentab24f0129f680ecbdd62bca39b101eec03eb6038 (diff)
downloadmkinitcpio-d397043814a47f0762175a9999a01f3ec0088152.tar.gz
mkinitcpio-d397043814a47f0762175a9999a01f3ec0088152.tar.xz
fsck: leverage blank /etc/fstab included by base
Since 3b18c9cd we have a blank /etc/fstab in the image. This is also forward thinking for the next release of util-linux (2.22), where fsck complains loudly about my filthy hack of using /dev/null as /etc/fstab. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--init_functions2
-rw-r--r--install/base2
2 files changed, 2 insertions, 2 deletions
diff --git a/init_functions b/init_functions
index 0233aa2..b11e2e1 100644
--- a/init_functions
+++ b/init_functions
@@ -107,7 +107,7 @@ fsck_device() {
fi
msg ":: performing fsck on '$1'"
- FSTAB_FILE=/dev/null fsck -Ta -C"$FSCK_FD" "$1" -- ${forcefsck+-f}
+ fsck -Ta -C"$FSCK_FD" "$1" -- ${forcefsck+-f}
}
fsck_root() {
diff --git a/install/base b/install/base
index 87c0b5d..eee61c9 100644
--- a/install/base
+++ b/install/base
@@ -28,7 +28,7 @@ build() {
add_symlink "/etc/mtab" "/proc/self/mounts"
- # Add an empty fstab to avoid mount warning when -o remount is used
+ # Add an empty fstab for mount and fsck
>"$BUILDROOT/etc/fstab"
add_file "/usr/lib/initcpio/init_functions" "/init_functions"