From: Marcel Partap <mpartap@gmx.net>
Date: Mon, 9 Sep 2019 14:08:40 +0000 (+0200)
Subject: Fix spurious error msgs from live-boot about failed mounts…
X-Git-Tag: debian/1%20210122~12^2
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=5bf9f572c763fb17eb75b254896406ce7b93e57c

Fix spurious error msgs from live-boot about failed mounts…

.. and directories already existing

> mount: mounting /dev/sr0 on /run/live/persistence/sr0 failed: No such device
> mount: mounting /dev/vda on /run/live/persistence/vda failed: No such device
> mkdir: can't create directory '/run/live/persistence/vda3/rw': File exists
> mkdir: can't create directory '/run/live/persistence/vda3/work': File exists
---

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 75338e0..7994ecd 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -780,7 +780,7 @@ mount_persistence_media ()
 		then
 			mount_opts="ro,noatime"
 		fi
-		if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null
+		if mount -t "${fstype}" -o "${mount_opts}" "${device}" "${backing}" >/dev/null 2>&1
 		then
 			echo ${backing}
 			return 0
@@ -1383,8 +1383,8 @@ do_union ()
 			# + a workdir to become mounted
 			# + workdir and upperdir to reside under the same mount
 			# + workdir and upperdir to be in separate directories
-			mkdir "${unionrw}/rw"
-			mkdir "${unionrw}/work"
+			mkdir -p "${unionrw}/rw"
+			mkdir -p "${unionrw}/work"
 			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
 			;;
 	esac