Attachment 147110 Details for Bug 193486 – ${name}_env introduction

[patch] ${name}_env introduction

env.diff (text/plain), 1.86 KB, created by Eugene Grosbein on 2014-09-09 13:45:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Grosbein

Created: 2014-09-09 13:45:36 UTC

Size: 1.86 KB

patch

obsolete

>--- share/man/man5/rc.conf.5.orig	2014-05-05 17:00:22.000000000 +0700
>+++ share/man/man5/rc.conf.5	2014-09-09 20:31:13.000000000 +0700
>@@ -172,6 +172,11 @@
> .Pq Vt str
> .Xr chroot
> to this directory before running the service.
>+.It Ao Ar name Ac Ns Va _env
>+.Pq Vt str
>+List of
>+.Xr env 1
>+arguments (enviroment variables) to run the service under.
> .It Ao Ar name Ac Ns Va _user
> .Pq Vt str
> Run the service under this user account.
>--- etc/rc.subr.orig	2014-05-05 17:00:32.000000000 +0700
>+++ etc/rc.subr	2014-09-09 20:35:44.000000000 +0700
>@@ -753,6 +753,8 @@
> #	${name}_chdir	n	Directory to cd to before running ${command}
> #				(if not using ${name}_chroot).
> #
>+#	${name}_env	n	List of environment variables to run ${command} with.
>+#
> #	${name}_flags	n	Arguments to call ${command} with.
> #				NOTE:	$flags from the parent environment
> #					can be used to override this.
>@@ -938,6 +940,7 @@
> 	eval _chdir=\$${name}_chdir	_chroot=\$${name}_chroot \
> 	    _nice=\$${name}_nice	_user=\$${name}_user \
> 	    _group=\$${name}_group	_groups=\$${name}_groups \
>+	    _env=\"\$${name}_env\" \
> 	    _fib=\$${name}_fib
> 
> 	if [ -n "$_user" ]; then	# unset $_user if running as that user
>@@ -1022,12 +1025,14 @@
> 			if [ -n "$_chroot" ]; then
> 				_doit="\
> ${_nice:+nice -n $_nice }\
>+${_env:+env $_env }\
> ${_fib:+setfib -F $_fib }\
> chroot ${_user:+-u $_user }${_group:+-g $_group }${_groups:+-G $_groups }\
> $_chroot $command $rc_flags $command_args"
> 			else
> 				_doit="\
> ${_chdir:+cd $_chdir && }\
>+${_env:+env $_env }\
> ${_fib:+setfib -F $_fib }\
> $command $rc_flags $command_args"
> 				if [ -n "$_user" ]; then
>@@ -2036,7 +2041,7 @@
> # check_namevarlist var
> #	Return "0" if ${name}_var is reserved in rc.subr.
> 
>-_rc_namevarlist="program chroot chdir flags fib nice user group groups"
>+_rc_namevarlist="program chroot chdir env flagsfib nice user group groups"
> check_namevarlist()
> {
> 	local _v

Actions: View | Diff

Attachments on bug 193486: 147110 | 147111