summaryrefslogtreecommitdiffstats
path: root/etc/rc.d/abi
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2005-12-19 10:57:00 +0000
committerdougb <dougb@FreeBSD.org>2005-12-19 10:57:00 +0000
commitc9292fd99587d6b4b4b6c2d4d766fe6394410469 (patch)
tree9f4b4470a1178cab80eeca6943edbdc5e7a581c9 /etc/rc.d/abi
parent239343cecc20abf2855c9c85f2ecf7fae8884031 (diff)
downloadFreeBSD-src-c9292fd99587d6b4b4b6c2d4d766fe6394410469.zip
FreeBSD-src-c9292fd99587d6b4b4b6c2d4d766fe6394410469.tar.gz
Clear up problems with /etc/rc.d/{abi|cleanvar|cleartmp} brought
to light by the PR. Specifically, convert these three scripts into good rc.d citizens, making sure that their functionality is preserved, but the rc.d framework rules are not broken. Add support for cleanvar as a regular rc.d script in the default rc.conf, and document this in the man page. Add a descriptive comment to rc.conf that regarding the three emulation/compatibility services provided by abi so users will not be confused by these services not having their own startup scripts. PR: conf/84574 Submitted by: Alexander Botero-Lowry
Diffstat (limited to 'etc/rc.d/abi')
-rw-r--r--etc/rc.d/abi39
1 files changed, 19 insertions, 20 deletions
diff --git a/etc/rc.d/abi b/etc/rc.d/abi
index 53c5447..a60fd68 100644
--- a/etc/rc.d/abi
+++ b/etc/rc.d/abi
@@ -10,12 +10,9 @@
. /etc/rc.subr
-echo -n 'Additional ABI support:'
-
-name="sysvipc"
-rcvar=`set_rcvar`
-start_cmd="sysv_start"
-stop_cmd=":"
+name="abi"
+start_precmd="${name}_prestart"
+start_cmd=":"
sysv_start()
{
@@ -24,12 +21,6 @@ sysv_start()
kldload sysvsem >/dev/null 2>&1
kldload sysvshm >/dev/null 2>&1
}
-load_rc_config $name
-run_rc_command "$1"
-
-name="linux"
-rcvar=`set_rcvar`
-start_cmd="linux_start"
linux_start()
{
@@ -41,15 +32,23 @@ linux_start()
/compat/linux/sbin/ldconfig
fi
}
-load_rc_config $name
-run_rc_command "$1"
-name="svr4"
-rcvar=`set_rcvar`
-start_precmd="echo -n ' svr4'"
-start_cmd="kldload svr4 > /dev/null 2>&1"
+svr4_start()
+{
+ echo -n ' svr4'
+ kldload svr4 > /dev/null 2>&1
+}
+
+abi_prestart()
+{
+ echo -n 'Additional ABI support:'
+
+ checkyesno sysvipc_enable && sysv_start
+ checkyesno linux_enable && linux_start
+ checkyesno svr4_enable && svr4_start
+
+ echo '.'
+}
load_rc_config $name
run_rc_command "$1"
-
-echo '.'
OpenPOWER on IntegriCloud