summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-08-15 18:02:49 +0000
committerobrien <obrien@FreeBSD.org>2000-08-15 18:02:49 +0000
commitb4ef1cd578c41f9d2bf091eff7c199390d3c2923 (patch)
tree7f7a6333dc2095e00ad24b7e5423173db95ef260
parent740ddcaef2f6944d79ef4554ef453f523e07b437 (diff)
downloadFreeBSD-src-b4ef1cd578c41f9d2bf091eff7c199390d3c2923.zip
FreeBSD-src-b4ef1cd578c41f9d2bf091eff7c199390d3c2923.tar.gz
Move the running of the Linux and SVR4 compat bits to the arch independent
location. Sponsored by: LinuxWorld frustration
-rw-r--r--etc/etc.amd64/rc.amd6416
-rw-r--r--etc/etc.i386/rc.i38616
-rw-r--r--etc/rc17
3 files changed, 17 insertions, 32 deletions
diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64
index 778c8a5..a17ccaa 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 778c8a5..a17ccaa 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 d3da463..ca94011 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
OpenPOWER on IntegriCloud