- Update to 1.3.1

- Pass user-overridable SERVICE_DIR into installed rundvsdir.sh startup
  file as well
This commit is contained in:
Sergei Kolobov 2005-09-07 08:15:35 +00:00
parent f446e728b4
commit ae4567ac12
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=142145
3 changed files with 9 additions and 8 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME= runit PORTNAME= runit
PORTVERSION= 1.3.0 PORTVERSION= 1.3.1
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://smarden.org/${PORTNAME}/ MASTER_SITES= http://smarden.org/${PORTNAME}/
@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR}/admin/${DISTNAME}
ALL_TARGET= default ALL_TARGET= default
SERVICE_DIR?= /var/service SERVICE_DIR?= /var/service
SUB_LIST= SERVICE_DIR="${SERVICE_DIR}"
MAN8= chpst.8 runit-init.8 runit.8 runsv.8 runsvchdir.8 \ MAN8= chpst.8 runit-init.8 runit.8 runsv.8 runsvchdir.8 \
runsvctrl.8 runsvdir.8 runsvstat.8 sv.8 svlogd.8 \ runsvctrl.8 runsvdir.8 runsvstat.8 sv.8 svlogd.8 \

View file

@ -1,2 +1,2 @@
MD5 (runit-1.3.0.tar.gz) = a30420421e6d374afde59297941136ed MD5 (runit-1.3.1.tar.gz) = c4e99c9e89088ff4378a3722eb0b77b9
SIZE (runit-1.3.0.tar.gz) = 97633 SIZE (runit-1.3.1.tar.gz) = 98452

View file

@ -11,7 +11,7 @@
# Add the following lines to /etc/rc.conf to enable `runsvdir': # Add the following lines to /etc/rc.conf to enable `runsvdir':
# #
#runsvdir_enable="YES" (default: NO) #runsvdir_enable="YES" (default: NO)
#runsvdir_path="/service" (default: /var/service) #runsvdir_path="/service" (default: %%SERVICE_DIR%%)
# #
. "/etc/rc.subr" . "/etc/rc.subr"
@ -28,9 +28,9 @@ runsvdir_start()
{ {
/bin/test -d ${runsvdir_path} || /bin/mkdir -p ${runsvdir_path} /bin/test -d ${runsvdir_path} || /bin/mkdir -p ${runsvdir_path}
/usr/bin/env -i \ /usr/bin/env -i \
PATH=/command:%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin \ PATH=/command:%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin \
/usr/sbin/daemon \ /usr/sbin/daemon \
${command} ${runsvdir_path} ${command} ${runsvdir_path}
} }
runsvdir_post_stop() runsvdir_post_stop()
@ -41,6 +41,6 @@ runsvdir_post_stop()
# read configuration and set defaults # read configuration and set defaults
load_rc_config "$name" load_rc_config "$name"
: ${runsvdir_enable="NO"} : ${runsvdir_enable="NO"}
: ${runsvdir_path="/var/service"} : ${runsvdir_path="%%SERVICE_DIR%%"}
run_rc_command "$1" run_rc_command "$1"