From fd80b6fc67ec6a0fe4853167fb67ee40bb51b742 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Tue, 26 Apr 2016 12:43:50 -0500 Subject: localmount/netmount: clean up critical mount processing Fix a typo and do not fail if a path in critical_mounts is not listed as a critical mount does not get mounted. --- init.d/localmount.in | 8 ++++++-- init.d/netmount.in | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'init.d') diff --git a/init.d/localmount.in b/init.d/localmount.in index 96ccc44b..b7de0d82 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -41,9 +41,13 @@ start() rc=0 else for x in ${critical_mounts}; do - mountinfo -q $x || critical=x + fstabinfo -q $x || continue + if ! mountinfo -q $x; then + critical=x + eerror "Failed to mount $x" + fi done - [-z "$critical" ] && rc=0 + [ -z "$critical" ] && rc=0 fi return $rc } diff --git a/init.d/netmount.in b/init.d/netmount.in index 0febde2a..ede4d329 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -46,9 +46,13 @@ start() rc=0 else for x in ${critical_mounts}; do - mountinfo -q $x || critical=x + fstabinfo -q $x || continue + if ! mountinfo -q $x; then + critical=x + eerror "Failed to mount $x" + fi done - [-z "$critical" ] && rc=0 + [ -z "$critical" ] && rc=0 fi return $rc } -- cgit v1.2.3