From: Jan Blunck <jblunck@vyatta.com>
Date: Mon, 2 Sep 2013 15:03:42 +0000 (+0200)
Subject: Move check for block device to mount_persistence_media().
X-Git-Tag: debian/4.0_a14-1~5
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=608d41f64972697b7389678d63d1391daa2fab42

Move check for block device to mount_persistence_media().

We should only check for the persistence media path being a block device
where it is really required which is the case in mount_persistence_media().
---

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index 570a12a..c502d59 100755
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -694,6 +694,11 @@ mount_persistence_media ()
 	device=${1}
 	probe=${2}
 
+	if [ ! -b "${device}" ]
+	then
+		return 1
+	fi
+
 	backing="/live/persistence/$(basename ${device})"
 
 	mkdir -p "${backing}"
@@ -1250,11 +1255,6 @@ get_custom_mounts ()
 
 	for device in ${devices}
 	do
-		if [ ! -b "${device}" ]
-		then
-			continue
-		fi
-
 		local device_name backing include_list
 		device_name="$(basename ${device})"
 		backing=$(mount_persistence_media ${device})