Luke Mewburn has indicated that they (NetBSD) are not interested

in keeping the scripts under rc.d in sync with us. So, remove
NetBSD specific stuff (which made our scripts more complicated
than necessary).

The NetBSD ident string will be left intact, both for history and
also incase we wish to pull in future versions.

1 files changed, 25 insertions, 37 deletions

diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 55bc985..4accff6 100755
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -18,47 +18,35 @@ stop_cmd=":"
 
 ldconfig_start()
 {
-	case ${OSTYPE} in
-	FreeBSD)
-		_ins=
-		ldconfig=${ldconfig_command}
-		checkyesno ldconfig_insecure && _ins="-i"
-		if [ -x "${ldconfig_command}" ]; then
-			_LDC="/lib /usr/lib"
-			for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
+	_ins=
+	ldconfig=${ldconfig_command}
+	checkyesno ldconfig_insecure && _ins="-i"
+	if [ -x "${ldconfig_command}" ]; then
+		_LDC="/lib /usr/lib"
+		for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
+			if [ -r "${i}" ]; then
+				_LDC="${_LDC} ${i}"
+			fi
+		done
+		echo 'ELF ldconfig path:' ${_LDC}
+		${ldconfig} -elf ${_ins} ${_LDC}
+
+		# Legacy aout support for i386 only
+		case `sysctl -n hw.machine_arch` in
+		i386)
+			# Default the a.out ldconfig path.
+			: ${ldconfig_paths_aout=${ldconfig_paths}}
+			_LDC=/usr/lib/aout
+			for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
 				if [ -r "${i}" ]; then
 					_LDC="${_LDC} ${i}"
 				fi
 			done
-			echo 'ELF ldconfig path:' ${_LDC}
-			${ldconfig} -elf ${_ins} ${_LDC}
-
-			# Legacy aout support for i386 only
-			case `sysctl -n hw.machine_arch` in
-			i386)
-				# Default the a.out ldconfig path.
-				: ${ldconfig_paths_aout=${ldconfig_paths}}
-				_LDC=/usr/lib/aout
-				for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do
-					if [ -r "${i}" ]; then
-						_LDC="${_LDC} ${i}"
-					fi
-				done
-				echo 'a.out ldconfig path:' ${_LDC}
-				${ldconfig} -aout ${_ins} ${_LDC}
-				;;
-			esac
-		fi
-		;;
-	NetBSD)
-		if [ -f ${ldconfig_command} ]; then
-			echo "Creating a.out runtime link editor directory cache."
-			${ldconfig_command}
-		fi
-		;;
-	*)
-		;;
-	esac
+			echo 'a.out ldconfig path:' ${_LDC}
+			${ldconfig} -aout ${_ins} ${_LDC}
+			;;
+		esac
+	fi
 }
 
 load_rc_config $name