Merging casper 1.129.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index 797f5df..46dcb74 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -982,7 +982,7 @@ setup_unionfs ()
                        fi
 
                        mkdir -p "${croot}/${imagename}"
-                       echo "debug: Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${croot}/${imagename}"
+                       echo "debug: Mounting backdev \"${backdev}\" (image = ${image}) on croot/imagename \"${croot}/${imagename}\""
                        mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
                fi
        done
@@ -1058,10 +1058,10 @@ setup_unionfs ()
                [ "${quiet}" != "y" ] && log_begin_msg \
                        "Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
                nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
-                       panic "Can not mount ${cowdevice} on /cow"
+                       panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
        else
-               mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || \
-                       panic "Can not mount ${cowdevice} on /cow"
+               mount -t ${cow_fstype} -o rw,noatime ${cowdevice} /cow || \
+                       panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
        fi
 
        rofscount=$(echo ${rofslist} |wc -w)