From 3f6c47f3ecdcbc1c18011b493764994b63a5f0ed Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 15 Aug 2000 18:02:49 +0000
Subject: [PATCH] Move the running of the Linux and SVR4 compat bits to the
 arch independent location.

Sponsored by:   LinuxWorld frustration
---
 etc/etc.amd64/rc.amd64 | 16 ----------------
 etc/etc.i386/rc.i386   | 16 ----------------
 etc/rc                 | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64
index 778c8a5f75b6..a17ccaab86ad 100644
--- a/etc/etc.amd64/rc.amd64
+++ b/etc/etc.amd64/rc.amd64
@@ -35,22 +35,6 @@ case ${ibcs2_enable} in
 	;;
 esac
 
-# Start the Linux binary compatibility if requested.
-#
-case ${linux_enable} in
-[Yy][Ee][Ss])
-	echo -n ' linux';	linux > /dev/null 2>&1
-	;;
-esac
-
-# Start the SysVR4 binary emulation if requested.
-#
-case ${svr4_enable} in
-[Yy][Ee][Ss])
-	echo -n ' svr4';	svr4 > /dev/null 2>&1
-	;;
-esac
-
 case ${xtend_enable} in
 [Yy][Ee][Ss])
  	echo -n ' xtend';	/usr/libexec/xtend
diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386
index 778c8a5f75b6..a17ccaab86ad 100644
--- a/etc/etc.i386/rc.i386
+++ b/etc/etc.i386/rc.i386
@@ -35,22 +35,6 @@ case ${ibcs2_enable} in
 	;;
 esac
 
-# Start the Linux binary compatibility if requested.
-#
-case ${linux_enable} in
-[Yy][Ee][Ss])
-	echo -n ' linux';	linux > /dev/null 2>&1
-	;;
-esac
-
-# Start the SysVR4 binary emulation if requested.
-#
-case ${svr4_enable} in
-[Yy][Ee][Ss])
-	echo -n ' svr4';	svr4 > /dev/null 2>&1
-	;;
-esac
-
 case ${xtend_enable} in
 [Yy][Ee][Ss])
  	echo -n ' xtend';	/usr/libexec/xtend
diff --git a/etc/rc b/etc/rc
index d3da46354bfc..ca940115b17a 100644
--- a/etc/rc
+++ b/etc/rc
@@ -543,6 +543,23 @@ if [ -r /etc/rc.devfs ]; then
 	sh /etc/rc.devfs
 fi
 
+
+# Start the Linux binary compatibility if requested.
+#
+case ${linux_enable} in
+[Yy][Ee][Ss])
+	echo -n ' linux';	linux > /dev/null 2>&1
+	;;
+esac
+
+# Start the SysVR4 binary emulation if requested.
+#
+case ${svr4_enable} in
+[Yy][Ee][Ss])
+	echo -n ' svr4';	svr4 > /dev/null 2>&1
+	;;
+esac
+
 # Do traditional (but rather obsolete) rc.local file if it exists.  If you
 # use this file and want to make it programmatic, source /etc/defaults/rc.conf
 # in /etc/rc.local and add your custom variables to /etc/rc.conf, as