dmsquash: use info() and die() rather than echo

diff --git a/modules.d/90dmsquash-live/dmsquash-live-root b/modules.d/90dmsquash-live/dmsquash-live-root
index 06fd6747869018f2164b3ede77fbe1025b67b134..acec91d68ceb667abb827b3c99552d12ef6b7cb5 100755 (executable)
--- a/modules.d/90dmsquash-live/dmsquash-live-root
+++ b/modules.d/90dmsquash-live/dmsquash-live-root
@@ -31,7 +31,7 @@ getarg check || check=""
 if [ -n "$check" ]; then
     checkisomd5 --verbose $livedev || :
     if [ $? -ne 0 ]; then
-       echo "CD check failed!"
+       die "CD check failed!"
        exit 1
     fi
 fi
@@ -43,7 +43,7 @@ getarg rw && liverw=rw
 mount -n -t $fstype -o $liverw $livedev $NEWROOT
 RES=$?
 if [ "$RES" != "0" ]; then
-    echo "Failed to mount block device of live image"
+    die "Failed to mount block device of live image"
     exit 1
 fi
 
@@ -86,7 +86,7 @@ do_live_overlay() {
 
     if [ -z "$setup" ]; then
         if [ -n "$devspec" -a -n "$pathspec" ]; then
-           echo "Unable to find persistent overlay; using temporary"
+           warn "Unable to find persistent overlay; using temporary"
            sleep 5
         fi
 

diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
index 019ca3f2a9153500b27bb8f3ab9816d327351bbe..40ca0162756a8d896bea6d53a69ffe1d6c04e14d 100755 (executable)
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
@@ -33,8 +33,7 @@ case "$liveroot" in
        root="live:${root}"
         rootok=1 ;;
 esac
-echo "root was $root, liveroot is now $liveroot"
-
+info "root was $root, liveroot is now $liveroot"
 
 # make sure that init doesn't complain
 [ -z "$root" ] && root="live"