localmount: clean up handling of aufs branches

X-Gentoo-Bug: 560008
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=560008

1 files changed, 17 insertions, 14 deletions

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 29e73486..dde94af0 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -72,21 +72,24 @@ stop()
 			sync
 		fi
 
-		local aufs_branch aufs_mount_dir aufs_mount_point aufs_si_dir aufs_si_id
-		for aufs_si_dir in /sys/fs/aufs/*; do
-			aufs_mount_dir=${aufs_si_dir#/sys/fs/aufs/}
-			aufs_si_id="$(printf "%s" $aufs_mount_dir | sed 's/_/=/g')"
-			aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
-			for x in $aufs_si_dir/br[0-9][0-9][0-9]; do
-				aufs_branch=$(sed 's/=.*//g' $x)
-				eindent
-				if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
-					ewarn "Failed to remove branch $aufs_branch from aufs \
+		local aufs_branch aufs_mount_point aufs_si_id aufs_br_id branches
+		for aufs_si_dir in /sys/fs/aufs/si*; do
+			if [ -d "${aufs_si_dir}" ]; then
+				aufs_si_id="si=${aufs_si_dir#/sys/fs/aufs/si_}"
+				aufs_mount_point="$(mountinfo -o ${aufs_si_id})"
+				branches="$aufs_si_dir/br[0-9] $aufs_si_dir/br[0-9][0-9] $aufs_si_dir/br[0-9][0-9][0-9]"
+				for x in $branches; do
+					[ -e "${x}" ] || continue
+					aufs_branch=$(sed 's/=.*//g' $x)
+					eindent
+					if ! mount -o "remount,del:$aufs_branch" "$aufs_mount_point" > /dev/null 2>&1; then
+						ewarn "Failed to remove branch $aufs_branch from aufs \
 						$aufs_mount_point"
-				fi
-				eoutdent
-				sync
-			done
+					fi
+					eoutdent
+					sync
+				done
+			fi
 		done
 	fi