From 41f0e9d32c9df6078ee1cf5dd4935eb69cb0c0f8 Mon Sep 17 00:00:00 2001 From: Mike Makonnen Date: Wed, 6 Aug 2003 00:35:13 +0000 Subject: [PATCH] Rename localdaemons to localpkg. The original name was really a mistake since /usr/local/etc/rc.d scripts can (and usually do) start more than just daemons. Even the output in the script uses 'local packages.' Also, the term 'local daemons' is used by rc.d/local, which was etc/rc.local of rcOG fame. No repo-copy because there isn't much history to save. I will remove localdaemons shortly with all the other files that don't belong in rc.d anymore. Discussed with: dougb, freebsd-rc@yahoogroups.com --- etc/rc.d/Makefile | 2 +- etc/rc.d/localdaemons | 2 +- etc/rc.d/localpkg | 90 +++++++++++++++++++++++++++++++++++++++++++ etc/rc.d/netoptions | 2 +- 4 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 etc/rc.d/localpkg diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index d78a4584516..c1e4d741374 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -19,7 +19,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \ ipnat ipsec ipxrouted isdnd \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ - ldconfig local localdaemons lomac lpd \ + ldconfig local localdaemons localpkg lomac lpd \ motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs \ named netif netoptions \ diff --git a/etc/rc.d/localdaemons b/etc/rc.d/localdaemons index 99449756a8e..dfd93f47df7 100644 --- a/etc/rc.d/localdaemons +++ b/etc/rc.d/localdaemons @@ -6,7 +6,7 @@ # PROVIDE: localdaemons # REQUIRE: abi # BEFORE: securelevel -# KEYWORD: FreeBSD shutdown +# KEYWORD: FreeBSD nostart . /etc/rc.subr diff --git a/etc/rc.d/localpkg b/etc/rc.d/localpkg new file mode 100644 index 00000000000..add28fe0086 --- /dev/null +++ b/etc/rc.d/localpkg @@ -0,0 +1,90 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: localpkg +# REQUIRE: abi +# BEFORE: securelevel +# KEYWORD: FreeBSD shutdown + +. /etc/rc.subr + +name="localpkg" +start_cmd="pkg_start" +stop_cmd="pkg_stop" + +pkg_start() +{ + # For each dir in $local_startup, search for init scripts matching *.sh + # + case ${local_startup} in + [Nn][Oo] | '') + ;; + *) + echo -n 'Local package initialization:' + slist="" + if [ -z "${script_name_sep}" ]; then + script_name_sep=" " + fi + for dir in ${local_startup}; do + if [ -d "${dir}" ]; then + for script in ${dir}/*.sh; do + slist="${slist}${script_name_sep}${script}" + done + fi + done + script_save_sep="$IFS" + IFS="${script_name_sep}" + for script in ${slist}; do + if [ -x "${script}" ]; then + (set -T + trap 'exit 1' 2 + ${script} start) + elif [ -f "${script}" -o -L "${script}" ]; then + echo -n " (skipping ${script##*/}, not executable)" + fi + done + IFS="${script_save_sep}" + echo '.' + ;; + esac +} + +pkg_stop() +{ + echo -n 'Shutting down daemon processes:' + + # For each dir in $local_startup, search for init scripts matching *.sh + case ${local_startup} in + [Nn][Oo] | '') + ;; + *) + slist="" + if [ -z "${script_name_sep}" ]; then + script_name_sep=" " + fi + for dir in ${local_startup}; do + if [ -d "${dir}" ]; then + for script in ${dir}/*.sh; do + slist="${slist}${script_name_sep}${script}" + done + fi + done + script_save_sep="$IFS" + IFS="${script_name_sep}" + for script in `reverse_list ${slist}`; do + if [ -x "${script}" ]; then + (set -T + trap 'exit 1' 2 + ${script} stop) + fi + done + IFS="${script_save_sep}" + echo '.' + ;; + esac +} + +load_rc_config $name +run_rc_command "$1" diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index da773c99231..8a6df5ea1f8 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -4,7 +4,7 @@ # # PROVIDE: netoptions -# REQUIRE: localdaemons +# REQUIRE: localpkg # BEFORE: securelevel # KEYWORD: FreeBSD