diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-09-09 19:58:46 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-09-09 19:58:46 +0000 |
| commit | f993ed2fbd3c307200ed9a6351e649f0904b39c5 (patch) | |
| tree | 0b2e3ac75f2bfe21c4cd09569748957566ab92d9 /libexec | |
| parent | e008cf3eb58f57efc484c8aaef1fbc9f8f146036 (diff) | |
| parent | 209002976934ad70cc924b01d261832c796f503a (diff) | |
Notes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rc/Makefile | 5 | ||||
| -rw-r--r-- | libexec/rc/rc.d/Makefile | 3 | ||||
| -rw-r--r-- | libexec/rc/rc.subr | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libexec/rc/Makefile b/libexec/rc/Makefile index 3e75a15201b9f..974eb86611822 100644 --- a/libexec/rc/Makefile +++ b/libexec/rc/Makefile @@ -5,6 +5,8 @@ CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS CONFETCDIR= /etc CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown rc.bsdextended +CONFETCPACKAGE= rc + .if ${MK_IPFW} != "no" CONFETC+= rc.firewall .endif @@ -15,9 +17,10 @@ CONFETCMODE= 644 CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend CONFETCEXECDIR= /etc CONFETCEXECMODE= 755 +CONFETCEXECPACKAGE= rc CONFETCDEFAULTSDIR= /etc/defaults CONFETCDEFAULTS= rc.conf -#PACKAGE=rc +CONFETCDEFAULTSPACKAGE= rc SUBDIR+= rc.d diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 40e594bca5701..06b365abb100a 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -4,7 +4,7 @@ CONFDIR= /etc/rc.d CONFGROUPS= CONFS -#PACKAGE=rc +CONFSPACKAGE= rc CONFS= DAEMON \ FILESYSTEMS \ @@ -324,7 +324,6 @@ ZFS+= zfs ZFS+= zfsbe ZFS+= zfsd ZFS+= zvol -ZFSPACKAGE= zfs .endif .for fg in ${CONFGROUPS} diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 93d2cfda87b77..4ae3c7ec1084a 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1036,6 +1036,9 @@ run_rc_command() _postcmd=\$${rc_arg}_postcmd if [ -n "$_cmd" ]; then + if [ -n "$_env" ]; then + eval "export -- $_env" + fi _run_rc_precmd || return 1 _run_rc_doit "$_cmd $rc_extra_args" || return 1 _run_rc_postcmd |