[patch] Patch to Cleanup minor quibbles in /etc/init.d/autoconfig

autoconfig-cleanup1.patch (text/plain), 1.87 KB, created by Joshua Kinard on 2005-09-23 05:24:14 UTC

--- autoconfig.orig	2005-09-25 23:54:38 -0400
+++ autoconfig	2005-09-26 00:51:19 -0400
@@ -18,63 +18,36 @@ get_config() {
 	CMDLINE="$(cat /proc/cmdline)"
 
 	for x in ${CMDLINE} ; do
-		if [ "${x}" = "nodetect" ]
-		then
-			DETECT="no"
-			GPM="no"
-			HOTPLUG="no"
-			APM="no"
-			ACPI="no"
-			ALSA="no"
-			X11="no"
-		fi
-
-		if [ "${x}" = "nodhcp" ]
-		then
-			DHCP="no"
-		fi
-
-		if [ "${x}" = "nogpm" ]
-		then
-			GPM="no"
-		fi
-
-		if [ "${x}" = "dopcmcia" ]
-		then
-			PCMCIA="yes"
-		fi
-	
-		if [ "${x}" = "doapm" ]
-		then
-			APM="yes"
-			ACPI="no"
-		fi
-
-		if [ "${x}" = "acpi=on" -o "${x}" = "acpi=force" ]
-		then
-			APM="no"
-			ACPI="yes"
-		fi
-
-		if [ "${x}" = "ide=nodma" ]
-		then
-			IDEDMA="no"
-		fi
-
-		if [ "${x}" = "nohotplug" ]
-		then
-			HOTPLUG="no"
-		fi
-
-		if [ "${x}" = "nosound" ]
-		then
-			ALSA="no"
-		fi
-
-		if [ "${x}" = "nox" ]
-		then
-			X11="no"
-		fi
+		case "${x}" in
+			nodetect)
+					DETECT="no"
+					GPM="no"
+					HOTPLUG="no"
+					APM="no"
+					ACPI="no"
+					ALSA="no"
+					X11="no"
+					;;
+
+			nodhcp)		DHCP="no"	;;
+			nogpm)		GPM="no"	;;
+			dopcmcia)	PCMCIA="yes"	;;
+
+			doapm)
+					APM="yes"
+					ACPI="no"
+					;;
+
+			acpi=on|acpi=force)
+					APM="no"
+					ACPI="yes"
+					;;
+
+			ide=nodma)	IDEDMA="no"	;;
+			nohotplug)	HOTPLUG="no"	;;
+			nosound)	ALSA="no"	;;
+			nox)		X11="no"	;;
+		esac
 	done
 }
 
@@ -227,7 +200,7 @@ start() {
 		do
 			if [ "${DHCP}" = "yes" ]
 			then
-				ebegin ${GOOD}"Network device${HILITE}${nics}${GOOD} detected,${WARN} DHCP broadcasting for IP.${NORMAL}"
+				ebegin ${GOOD}"Network device ${HILITE}${nics}${GOOD} detected,${WARN} DHCP broadcasting for IP.${NORMAL}"
 				dhcpcd -n -h $(hostname) &
 			fi
 			eend
@@ -283,6 +256,7 @@ start() {
 		fi
 	else
 		ebegin ${BAD}"Skipping ALSA detection as requested on boot commandline."
+		echo -e ""
 	fi
 
 	if [ "${DETECT}" = "yes" ]