Simplify this script with the added bonus that the bit about i386

initialization doesn't get printed unless ibcs2_enable is set.

1 files changed, 17 insertions, 22 deletions

diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep
index 466f45f..ef5c84e 100644
--- a/etc/rc.d/archdep
+++ b/etc/rc.d/archdep
@@ -13,37 +13,32 @@ name=archdep
 start_cmd="archdep_start"
 stop_cmd=":"
 
-# SCO binary emulation
-#
-ibcs2_compat()
-{
-	if checkyesno ibcs2_enable; then
-		echo -n ' ibcs2'
-		load_kld ibcs2
-		case ${ibcs2_loaders} in
-		[Nn][Oo])
-			;;
-		*)
-			for i in ${ibcs2_loaders}; do
-				load_kld ibcs2_$i
-			done
-			;;
-		esac
-	fi
-}
-
 archdep_start()
 {
 	local _arch
 
 	_arch=`${SYSCTL_N} hw.machine_arch`
-	echo -n "Initial $_arch initialization:"
 	case $_arch in
 	i386)
-		ibcs2_compat
+		# SCO binary emulation
+		#
+		if checkyesno ibcs2_enable; then
+			echo -n 'Initial i386 initialization:'
+			echo -n ' ibcs2'
+			load_kld ibcs2
+			case ${ibcs2_loaders} in
+			[Nn][Oo])
+				;;
+			*)
+				for i in ${ibcs2_loaders}; do
+					load_kld ibcs2_$i
+				done
+				;;
+			esac
+			echo '.'
+		fi
 		;;
 	esac
-	echo '.'
 }
 
 load_rc_config $name