[projects/rc-scripts] simplify & readability

[glen]

commit 3071380aa92221420208bf9fb347d8358da45f3a
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 18 00:10:53 2014 +0200

    simplify & readability

 rc.d/rc.sysinit | 61 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)
---
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index ee8041c..27b3477 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -270,43 +270,44 @@ init_mdadm() {
 
 	modprobe -s md
 	local rc=0
-	if [ -f /proc/mdstat ]; then
-		golvm=0
-
-		if grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf; then
-			show "Starting up RAID devices"; busy
-			/sbin/mdadm --assemble --scan --auto=yes
-			rc=$?
-			if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then
-				# rc is used later, too so set sane value
-				rc=0
-				deltext; ok
-				golvm=1
-			else
-				deltext; fail
-			fi
+	if [ ! -f /proc/mdstat ]; then
+		return
+	fi
 
+	local golvm=0
+	if grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf; then
+		show "Starting up RAID devices"; busy
+		/sbin/mdadm --assemble --scan --auto=yes
+		rc=$?
+		if [ "$rc" -eq 0 -o "$rc" -eq 2 ]; then
+			# rc is used later too, so set sane value
+			rc=0
+			deltext; ok
+			golvm=1
+		else
+			deltext; fail
 		fi
 
-		# A non-zero return means there were problems
-		if [ $rc -gt 0 ]; then
-			[ -e /proc/splash ] && echo "verbose" > /proc/splash
-			show "Starting up RAID devices"; fail
+	fi
 
-			PS1="$(nls '(RAID Repair)# ')"; export PS1
-			repair_shell "$(nls '*** An error occurred during the RAID startup.')"
-		fi
+	# A non-zero return means there were problems
+	if [ $rc -gt 0 ]; then
+		[ -e /proc/splash ] && echo "verbose" > /proc/splash
+		show "Starting up RAID devices"; fail
 
-		# LVM on RAID (keep in sync with LVM init)
-		if [ "$golvm" -eq "1" ]; then
-			if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
-				run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
-				run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
-				[ "$lvmversion" = "2" ] && /sbin/vgmknodes
-			fi
+		PS1="$(nls '(RAID Repair)# ')"; export PS1
+		repair_shell "$(nls '*** An error occurred during the RAID startup.')"
+	fi
+
+	# LVM on RAID (keep in sync with LVM init)
+	if [ "$golvm" -eq "1" ]; then
+		if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
+			run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
+			run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
+			[ "$lvmversion" = "2" ] && /sbin/vgmknodes
 		fi
-		show "Starting up RAID devices"; ok
 	fi
+	show "Starting up RAID devices"; ok
 	return $rc
 }
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/rc-scripts.git/commitdiff/3071380aa92221420208bf9fb347d8358da45f3a