Shawn Dunn
7955a4d13a
- Update dracut to 037 * Add --hostonly_cmdline switch * Update --mount syntax * Include modules from /updates directory * Fixes for network setup * Some small fixes - Rediff patches - Include iscsiuio again (bnc#872474) Remove: remove-iscsiuio.patch - Install 59-scsi-sg_utils.rules (bnc#872478) Add: 0015-95udev-rules-Add-59-scsi-sg_utils.rules.patch - Install 67-kpartx-compat.rules (bnc#872662) Add: 0016-90multipath-add-67-kpartx-compat.rules.patch - Install separate multipath service file (bnc#871610) Add: 0017-90multipath-install-dracut-specific-service-file.patch - Do not fsck and mount from fstab if systemd is used (bnc# Add: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch - Fixup initqueue for remote-fs Add: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch OBS-URL: https://build.opensuse.org/request/show/229484 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=124
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 88ed5bf13a56f9397cc50eb329785553eb82c210 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
|
|
index 12711a0..a237810 100755
|
|
--- 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
|
|
--
|
|
1.8.1.4
|
|
|