minor cleanups in parsing for dmsquash-live and livenet
- use wait_for_dev in livenet - clarify log message and fix missing newline in dmsquash-live Signed-off-by: Will Woods <wwoods@redhat.com>master
parent
1cc57edaf5
commit
a75c3afe68
|
|
@ -43,9 +43,9 @@ case "$liveroot" in
|
|||
live:/*.[Ii][Mm][Gg]|/*.[Ii][Mm][Gg])
|
||||
[ -f "${root#live:}" ] && rootok=1 ;;
|
||||
esac
|
||||
info "liveroot was $liveroot, is now $root"
|
||||
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 /dev/mapper/live-rw
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ case "$liveurl" in
|
|||
rootok=1 ;;
|
||||
esac
|
||||
|
||||
echo '[ -e /dev/root ]' > $hookdir/initqueue/finished/livenet.sh
|
||||
wait_for_dev /dev/root
|
||||
|
|
|
|||
Loading…
Reference in New Issue