diff options
author | dteske <dteske@FreeBSD.org> | 2012-10-03 02:32:47 +0000 |
---|---|---|
committer | dteske <dteske@FreeBSD.org> | 2012-10-03 02:32:47 +0000 |
commit | ae42961686c0ffdabdf4432badf90120b39c253c (patch) | |
tree | 099c04954d6b260d388c0c2308be3db9cdbfee73 /usr.sbin/bsdconfig | |
parent | 22657893cf406906bc90adf4d67c26444ea9930f (diff) | |
download | FreeBSD-src-ae42961686c0ffdabdf4432badf90120b39c253c.zip FreeBSD-src-ae42961686c0ffdabdf4432badf90120b39c253c.tar.gz |
Import sysutils/sysrc from the ports tree (current version 5.1). Importing
disconnected under the WITH_BSDCONFIG flag (a good idea since this version of
sysrc(8) indeed requires the `sysrc.subr' module installed by bsdconfig(8)).
Multiple reasons sysrc should not simply continue to live in ports. The most
important being that it is tightly coupled with the base.
Approved by: adrian (co-mentor)
Diffstat (limited to 'usr.sbin/bsdconfig')
-rw-r--r-- | usr.sbin/bsdconfig/share/sysrc.subr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdconfig/share/sysrc.subr b/usr.sbin/bsdconfig/share/sysrc.subr index ca47067..1ee70e6 100644 --- a/usr.sbin/bsdconfig/share/sysrc.subr +++ b/usr.sbin/bsdconfig/share/sysrc.subr @@ -29,10 +29,10 @@ if [ ! "$_SYSRC_SUBR" ]; then _SYSRC_SUBR=1 ############################################################ INCLUDES BSDCFG_SHARE="/usr/share/bsdconfig" -. $BSDCFG_SHARE/common.subr || exit 1 +[ "$_COMMON_SUBR" ] || . $BSDCFG_SHARE/common.subr || exit 1 BSDCFG_LIBE="/usr/libexec/bsdconfig" -f_include_lang $BSDCFG_LIBE/include/messages.subr +[ ! "$_SYSRC_JAILED" ] && f_include_lang $BSDCFG_LIBE/include/messages.subr ############################################################ CONFIGURATION |