|
 |
83bbb1 |
From a110aa35c4e91e2f93c4fc2c7e83120433280393 Mon Sep 17 00:00:00 2001
|
|
|
83bbb1 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
83bbb1 |
Date: Wed, 5 Feb 2014 13:12:29 +0100
|
|
|
83bbb1 |
Subject: [PATCH] Do not reload systemd with wait_for_dev
|
|
|
83bbb1 |
|
|
|
83bbb1 |
(cherry picked from commit 352d557d4d94042e321b4acc81eeab8691e19f42)
|
|
|
83bbb1 |
---
|
|
|
83bbb1 |
modules.d/90dmsquash-live/dmsquash-live-genrules.sh | 2 +-
|
|
|
83bbb1 |
modules.d/90dmsquash-live/parse-dmsquash-live.sh | 2 +-
|
|
|
83bbb1 |
modules.d/90livenet/parse-livenet.sh | 2 +-
|
|
|
83bbb1 |
modules.d/90lvm/parse-lvm.sh | 2 +-
|
|
|
83bbb1 |
modules.d/95iscsi/iscsiroot.sh | 2 +-
|
|
|
83bbb1 |
modules.d/95nbd/nbdroot.sh | 2 +-
|
|
|
83bbb1 |
modules.d/95nbd/parse-nbdroot.sh | 2 +-
|
|
|
83bbb1 |
7 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
83bbb1 |
|
|
|
83bbb1 |
diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
|
|
|
83bbb1 |
index b27fccc..0f51ed4 100755
|
|
|
83bbb1 |
--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
|
|
|
83bbb1 |
+++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh
|
|
|
83bbb1 |
@@ -9,7 +9,7 @@ case "$root" in
|
|
|
83bbb1 |
printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
|
|
|
83bbb1 |
${root#live:/dev/}
|
|
|
83bbb1 |
} >> /etc/udev/rules.d/99-live-squash.rules
|
|
|
83bbb1 |
- wait_for_dev "${root#live:}"
|
|
|
83bbb1 |
+ wait_for_dev -n "${root#live:}"
|
|
|
83bbb1 |
;;
|
|
|
83bbb1 |
live:*)
|
|
|
83bbb1 |
if [ -f "${root#live:}" ]; then
|
|
|
83bbb1 |
diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
|
|
|
83bbb1 |
index a5564e2..6e54dfe 100755
|
|
|
83bbb1 |
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
|
|
|
83bbb1 |
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
|
|
|
83bbb1 |
@@ -56,4 +56,4 @@ info "root was $liveroot, is now $root"
|
|
|
83bbb1 |
# make sure that init doesn't complain
|
|
|
83bbb1 |
[ -z "$root" ] && root="live"
|
|
|
83bbb1 |
|
|
|
83bbb1 |
-wait_for_dev /dev/mapper/live-rw
|
|
|
83bbb1 |
+wait_for_dev -n /dev/mapper/live-rw
|
|
|
83bbb1 |
diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh
|
|
|
83bbb1 |
index 6c847ba..a6b2842 100755
|
|
|
83bbb1 |
--- a/modules.d/90livenet/parse-livenet.sh
|
|
|
83bbb1 |
+++ b/modules.d/90livenet/parse-livenet.sh
|
|
|
83bbb1 |
@@ -27,7 +27,7 @@ if get_url_handler "$liveurl" >/dev/null; then
|
|
|
83bbb1 |
netroot="livenet:$liveurl"
|
|
|
83bbb1 |
root="livenet" # quiet complaints from init
|
|
|
83bbb1 |
rootok=1
|
|
|
83bbb1 |
- wait_for_dev /dev/root
|
|
|
83bbb1 |
+ wait_for_dev -n /dev/root
|
|
|
83bbb1 |
else
|
|
|
83bbb1 |
info "livenet: no url handler for $liveurl"
|
|
|
83bbb1 |
fi
|
|
|
83bbb1 |
diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh
|
|
|
83bbb1 |
index 74e1d43..d69cb45 100755
|
|
|
83bbb1 |
--- a/modules.d/90lvm/parse-lvm.sh
|
|
|
83bbb1 |
+++ b/modules.d/90lvm/parse-lvm.sh
|
|
|
83bbb1 |
@@ -13,7 +13,7 @@ if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \
|
|
|
83bbb1 |
rm -f -- /etc/udev/rules.d/64-lvm*.rules
|
|
|
83bbb1 |
else
|
|
|
83bbb1 |
for dev in $LV_DEVS; do
|
|
|
83bbb1 |
- wait_for_dev "/dev/$dev"
|
|
|
83bbb1 |
+ wait_for_dev -n "/dev/$dev"
|
|
|
83bbb1 |
done
|
|
|
83bbb1 |
fi
|
|
|
83bbb1 |
|
|
|
83bbb1 |
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
|
|
|
83bbb1 |
index 54f4990..1de6fb7 100755
|
|
|
83bbb1 |
--- a/modules.d/95iscsi/iscsiroot.sh
|
|
|
83bbb1 |
+++ b/modules.d/95iscsi/iscsiroot.sh
|
|
|
83bbb1 |
@@ -156,7 +156,7 @@ handle_netroot()
|
|
|
83bbb1 |
printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules
|
|
|
83bbb1 |
udevadm control --reload
|
|
|
83bbb1 |
write_fs_tab /dev/root
|
|
|
83bbb1 |
- wait_for_dev /dev/root
|
|
|
83bbb1 |
+ wait_for_dev -n /dev/root
|
|
|
83bbb1 |
|
|
|
83bbb1 |
# install mount script
|
|
|
83bbb1 |
[ -z "$DRACUT_SYSTEMD" ] && \
|
|
|
83bbb1 |
diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh
|
|
|
83bbb1 |
index 2e9d917..32f346d 100755
|
|
|
83bbb1 |
--- a/modules.d/95nbd/nbdroot.sh
|
|
|
83bbb1 |
+++ b/modules.d/95nbd/nbdroot.sh
|
|
|
83bbb1 |
@@ -102,7 +102,7 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then
|
|
|
83bbb1 |
udevadm control --reload
|
|
|
83bbb1 |
type write_fs_tab >/dev/null 2>&1 || . /lib/fs-lib.sh
|
|
|
83bbb1 |
write_fs_tab /dev/root "$nbdfstype" "$fsopts"
|
|
|
83bbb1 |
- wait_for_dev /dev/root
|
|
|
83bbb1 |
+ wait_for_dev -n /dev/root
|
|
|
83bbb1 |
|
|
|
83bbb1 |
if [ -z "$DRACUT_SYSTEMD" ]; then
|
|
|
83bbb1 |
printf '/bin/mount %s\n' \
|
|
|
83bbb1 |
diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh
|
|
|
83bbb1 |
index 49c44b6..fe5a7fa 100755
|
|
|
83bbb1 |
--- a/modules.d/95nbd/parse-nbdroot.sh
|
|
|
83bbb1 |
+++ b/modules.d/95nbd/parse-nbdroot.sh
|
|
|
83bbb1 |
@@ -61,6 +61,6 @@ rootok=1
|
|
|
83bbb1 |
# Shut up init error check
|
|
|
83bbb1 |
if [ -z "$root" ]; then
|
|
|
83bbb1 |
root=block:/dev/root
|
|
|
83bbb1 |
- wait_for_dev /dev/root
|
|
|
83bbb1 |
+ wait_for_dev -n /dev/root
|
|
|
83bbb1 |
fi
|
|
|
83bbb1 |
|