diff options
| -rw-r--r-- | libexec/rc/rc.d/Makefile | 2 | ||||
| -rwxr-xr-x | libexec/rc/rc.d/SERVERS | 2 | ||||
| -rwxr-xr-x | libexec/rc/rc.d/linux (renamed from libexec/rc/rc.d/abi) | 22 | ||||
| -rwxr-xr-x | libexec/rc/rc.d/localpkg | 2 |
4 files changed, 6 insertions, 22 deletions
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 08c69c5871b3..69f1f84fcaff 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -11,7 +11,6 @@ CONFS= DAEMON \ LOGIN \ NETWORKING \ SERVERS \ - abi \ addswap \ adjkerntz \ archdep \ @@ -51,6 +50,7 @@ CONFS= DAEMON \ kldxref \ ${_kpasswdd} \ ldconfig \ + linux \ local \ localpkg \ lockd \ diff --git a/libexec/rc/rc.d/SERVERS b/libexec/rc/rc.d/SERVERS index 9375d524e1d8..04468ef0fe64 100755 --- a/libexec/rc/rc.d/SERVERS +++ b/libexec/rc/rc.d/SERVERS @@ -4,7 +4,7 @@ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote sysvipc abi ldconfig savecore watchdogd +# REQUIRE: mountcritremote sysvipc linux ldconfig savecore watchdogd # This is a dummy dependency, for early-start servers relying on # some basic configuration. diff --git a/libexec/rc/rc.d/abi b/libexec/rc/rc.d/linux index 8284b58bdc98..ddb4243062b5 100755 --- a/libexec/rc/rc.d/abi +++ b/libexec/rc/rc.d/linux @@ -3,14 +3,14 @@ # $FreeBSD$ # -# PROVIDE: abi +# PROVIDE: linux # REQUIRE: archdep # KEYWORD: nojail . /etc/rc.subr -name="abi" -desc="Enable foreign ABIs" +name="linux" +desc="Enable Linux ABI" start_cmd="${name}_start" stop_cmd=":" @@ -18,7 +18,6 @@ linux_start() { local _tmpdir - echo -n ' linux' load_kld -e 'linux(aout|elf)' linux case `sysctl -n hw.machine_arch` in amd64) @@ -35,20 +34,5 @@ linux_start() fi } -abi_start() -{ - local _echostop - - _echostop= - if checkyesno linux_enable; then - echo -n 'Additional ABI support:' - _echostop=yes - fi - - checkyesno linux_enable && linux_start - - [ -n "${_echostop}" ] && echo '.' -} - load_rc_config $name run_rc_command "$1" diff --git a/libexec/rc/rc.d/localpkg b/libexec/rc/rc.d/localpkg index 8853138b3c17..97e0c17ec4bc 100755 --- a/libexec/rc/rc.d/localpkg +++ b/libexec/rc/rc.d/localpkg @@ -4,7 +4,7 @@ # # PROVIDE: localpkg -# REQUIRE: sysvipc abi +# REQUIRE: sysvipc linux # BEFORE: securelevel # KEYWORD: shutdown |