Blame 0034-minor-cleanups-in-parsing-for-dmsquash-live-and-live.patch

Harald Hoyer 3957aa
From a75c3afe685e563f919a1a87e0a12c996cfae735 Mon Sep 17 00:00:00 2001
Harald Hoyer 3957aa
From: Will Woods <wwoods@redhat.com>
Harald Hoyer 3957aa
Date: Wed, 11 Jan 2012 12:48:28 -0500
Harald Hoyer 3957aa
Subject: [PATCH] minor cleanups in parsing for dmsquash-live and livenet
Harald Hoyer 3957aa
Harald Hoyer 3957aa
- use wait_for_dev in livenet
Harald Hoyer 3957aa
- clarify log message and fix missing newline in dmsquash-live
Harald Hoyer 3957aa
Harald Hoyer 3957aa
Signed-off-by: Will Woods <wwoods@redhat.com>
Harald Hoyer 3957aa
---
Harald Hoyer 3957aa
 modules.d/90dmsquash-live/parse-dmsquash-live.sh |    4 ++--
Harald Hoyer 3957aa
 modules.d/90livenet/parse-livenet.sh             |    2 +-
Harald Hoyer 3957aa
 2 files changed, 3 insertions(+), 3 deletions(-)
Harald Hoyer 3957aa
Harald Hoyer 3957aa
diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
Harald Hoyer 3957aa
index 920647e..5ccc0d0 100755
Harald Hoyer 3957aa
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
Harald Hoyer 3957aa
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
Harald Hoyer 3957aa
@@ -43,9 +43,9 @@ case "$liveroot" in
Harald Hoyer 3957aa
     live:/*.[Ii][Mm][Gg]|/*.[Ii][Mm][Gg])
Harald Hoyer 3957aa
         [ -f "${root#live:}" ] && rootok=1 ;;
Harald Hoyer 3957aa
 esac
Harald Hoyer 3957aa
-info "liveroot was $liveroot, is now $root"
Harald Hoyer 3957aa
+info "root was $liveroot, is now $root"
Harald Hoyer 3957aa
 
Harald Hoyer 3957aa
 # make sure that init doesn't complain
Harald Hoyer 3957aa
 [ -z "$root" ] && root="live"
Harald Hoyer 3957aa
 
Harald Hoyer 3957aa
-wait_for_dev /dev/mapper/live-rw
Harald Hoyer 3957aa
\ No newline at end of file
Harald Hoyer 3957aa
+wait_for_dev /dev/mapper/live-rw
Harald Hoyer 3957aa
diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh
Harald Hoyer 3957aa
index 323fd4a..2e6bc4b 100755
Harald Hoyer 3957aa
--- a/modules.d/90livenet/parse-livenet.sh
Harald Hoyer 3957aa
+++ b/modules.d/90livenet/parse-livenet.sh
Harald Hoyer 3957aa
@@ -16,4 +16,4 @@ case "$liveurl" in
Harald Hoyer 3957aa
         rootok=1 ;;
Harald Hoyer 3957aa
 esac
Harald Hoyer 3957aa
 
Harald Hoyer 3957aa
-echo '[ -e /dev/root ]' > $hookdir/initqueue/finished/livenet.sh
Harald Hoyer 3957aa
+wait_for_dev /dev/root