2014-04-02 08:05:15 +00:00
|
|
|
From e920bfb1e8a5917e7b0f360d1c51d200db3acbfd Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: WANG Chao <chaowang@redhat.com>
|
|
|
|
|
Date: Tue, 1 Apr 2014 15:20:49 +0800
|
|
|
|
|
Subject: [PATCH] fstab: do not mount and fsck from fstab if using systemd
|
|
|
|
|
|
|
|
|
|
If using systemd in initramfs, we could run into a race condition when
|
|
|
|
|
dracut and systemd both are trying to mount and run fsck for the same
|
|
|
|
|
filesystem, and mount or fsck could be a failure.
|
|
|
|
|
|
|
|
|
|
To fix such failure, we should use systemd to mount/fsck from /etc/fstab
|
|
|
|
|
only.
|
|
|
|
|
|
|
|
|
|
v2: check $DRACUT_SYSTEMD suggested by Alexander Tsoy
|
|
|
|
|
|
|
|
|
|
Signed-off-by: WANG Chao <chaowang@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
modules.d/95fstab-sys/mount-sys.sh | 6 +++++-
|
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/modules.d/95fstab-sys/mount-sys.sh b/modules.d/95fstab-sys/mount-sys.sh
|
2014-06-28 15:43:30 +00:00
|
|
|
index 12711a07dd..a23781012f 100755
|
2014-04-02 08:05:15 +00:00
|
|
|
--- a/modules.d/95fstab-sys/mount-sys.sh
|
|
|
|
|
+++ b/modules.d/95fstab-sys/mount-sys.sh
|
|
|
|
|
@@ -27,7 +27,11 @@ fstab_mount() {
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-[ -f /etc/fstab ] && fstab_mount /etc/fstab
|
|
|
|
|
+# systemd will mount and run fsck from /etc/fstab and we don't want to
|
|
|
|
|
+# run into a race condition.
|
|
|
|
|
+if [ -z "$DRACUT_SYSTEMD" ]; then
|
|
|
|
|
+ [ -f /etc/fstab ] && fstab_mount /etc/fstab
|
|
|
|
|
+fi
|
|
|
|
|
|
|
|
|
|
# prefer $NEWROOT/etc/fstab.sys over local /etc/fstab.sys
|
|
|
|
|
if [ -f $NEWROOT/etc/fstab.sys ]; then
|
2014-06-28 15:43:30 +00:00
|
|
|
--
|
|
|
|
|
1.9.3
|
|
|
|
|
|
