You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
102 lines
4.0 KiB
102 lines
4.0 KiB
From 5648ff27e2df826bfb5721f115de83497ac5fb58 Mon Sep 17 00:00:00 2001 |
|
From: Harald Hoyer <harald@redhat.com> |
|
Date: Wed, 5 Feb 2014 13:12:29 +0100 |
|
Subject: [PATCH] Do not reload systemd with wait_for_dev |
|
|
|
--- |
|
modules.d/90dmsquash-live/dmsquash-live-genrules.sh | 2 +- |
|
modules.d/90dmsquash-live/parse-dmsquash-live.sh | 2 +- |
|
modules.d/90livenet/parse-livenet.sh | 2 +- |
|
modules.d/90lvm/parse-lvm.sh | 2 +- |
|
modules.d/95iscsi/iscsiroot.sh | 2 +- |
|
modules.d/95nbd/nbdroot.sh | 2 +- |
|
modules.d/95nbd/parse-nbdroot.sh | 2 +- |
|
7 files changed, 7 insertions(+), 7 deletions(-) |
|
|
|
diff --git a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh |
|
index b27fccc3..0f51ed46 100755 |
|
--- a/modules.d/90dmsquash-live/dmsquash-live-genrules.sh |
|
+++ b/modules.d/90dmsquash-live/dmsquash-live-genrules.sh |
|
@@ -9,7 +9,7 @@ case "$root" in |
|
printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \ |
|
${root#live:/dev/} |
|
} >> /etc/udev/rules.d/99-live-squash.rules |
|
- wait_for_dev "${root#live:}" |
|
+ wait_for_dev -n "${root#live:}" |
|
;; |
|
live:*) |
|
if [ -f "${root#live:}" ]; then |
|
diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh |
|
index a5564e20..6e54dfe7 100755 |
|
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh |
|
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh |
|
@@ -56,4 +56,4 @@ info "root was $liveroot, is now $root" |
|
# make sure that init doesn't complain |
|
[ -z "$root" ] && root="live" |
|
|
|
-wait_for_dev /dev/mapper/live-rw |
|
+wait_for_dev -n /dev/mapper/live-rw |
|
diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh |
|
index 6c847baa..a6b28423 100755 |
|
--- a/modules.d/90livenet/parse-livenet.sh |
|
+++ b/modules.d/90livenet/parse-livenet.sh |
|
@@ -27,7 +27,7 @@ if get_url_handler "$liveurl" >/dev/null; then |
|
netroot="livenet:$liveurl" |
|
root="livenet" # quiet complaints from init |
|
rootok=1 |
|
- wait_for_dev /dev/root |
|
+ wait_for_dev -n /dev/root |
|
else |
|
info "livenet: no url handler for $liveurl" |
|
fi |
|
diff --git a/modules.d/90lvm/parse-lvm.sh b/modules.d/90lvm/parse-lvm.sh |
|
index 74e1d43b..d69cb455 100755 |
|
--- a/modules.d/90lvm/parse-lvm.sh |
|
+++ b/modules.d/90lvm/parse-lvm.sh |
|
@@ -13,7 +13,7 @@ if ! getargbool 1 rd.lvm -d -n rd_NO_LVM \ |
|
rm -f -- /etc/udev/rules.d/64-lvm*.rules |
|
else |
|
for dev in $LV_DEVS; do |
|
- wait_for_dev "/dev/$dev" |
|
+ wait_for_dev -n "/dev/$dev" |
|
done |
|
fi |
|
|
|
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh |
|
index 54f49903..1de6fb75 100755 |
|
--- a/modules.d/95iscsi/iscsiroot.sh |
|
+++ b/modules.d/95iscsi/iscsiroot.sh |
|
@@ -156,7 +156,7 @@ handle_netroot() |
|
printf 'SYMLINK=="disk/by-path/*-iscsi-*-%s", SYMLINK+="root"\n' $iscsi_lun >> /etc/udev/rules.d/99-iscsi-root.rules |
|
udevadm control --reload |
|
write_fs_tab /dev/root |
|
- wait_for_dev /dev/root |
|
+ wait_for_dev -n /dev/root |
|
|
|
# install mount script |
|
[ -z "$DRACUT_SYSTEMD" ] && \ |
|
diff --git a/modules.d/95nbd/nbdroot.sh b/modules.d/95nbd/nbdroot.sh |
|
index ddb38192..8bfbebcb 100755 |
|
--- a/modules.d/95nbd/nbdroot.sh |
|
+++ b/modules.d/95nbd/nbdroot.sh |
|
@@ -102,7 +102,7 @@ if [ "$root" = "block:/dev/root" -o "$root" = "dhcp" ]; then |
|
udevadm control --reload |
|
type write_fs_tab >/dev/null 2>&1 || . /lib/fs-lib.sh |
|
write_fs_tab /dev/root "$nbdfstype" "$fsopts" |
|
- wait_for_dev /dev/root |
|
+ wait_for_dev -n /dev/root |
|
|
|
if [ -z "$DRACUT_SYSTEMD" ]; then |
|
printf '/bin/mount %s\n' \ |
|
diff --git a/modules.d/95nbd/parse-nbdroot.sh b/modules.d/95nbd/parse-nbdroot.sh |
|
index 49c44b6f..fe5a7fa4 100755 |
|
--- a/modules.d/95nbd/parse-nbdroot.sh |
|
+++ b/modules.d/95nbd/parse-nbdroot.sh |
|
@@ -61,6 +61,6 @@ rootok=1 |
|
# Shut up init error check |
|
if [ -z "$root" ]; then |
|
root=block:/dev/root |
|
- wait_for_dev /dev/root |
|
+ wait_for_dev -n /dev/root |
|
fi |
|
|
|
|