Do not reload systemd with wait_for_dev

master
Harald Hoyer 2014-02-05 13:12:29 +01:00
parent 751c7de98a
commit 352d557d4d
7 changed files with 7 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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


View File

@ -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" ] && \

View File

@ -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' \

View File

@ -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