aboutsummaryrefslogtreecommitdiff
path: root/sysutils/usermin/files
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2006-01-07 06:29:57 +0000
committerDoug Barton <dougb@FreeBSD.org>2006-01-07 06:29:57 +0000
commitffde46cbf97ed90584d8c10bdc6bae8094784387 (patch)
treeb78a36a23c5db32b200d7f48cb719e48b524fa47 /sysutils/usermin/files
parent0e2c03666de0675409d0d8eedd95734db4465b70 (diff)
downloadports-ffde46cbf97ed90584d8c10bdc6bae8094784387.tar.gz
ports-ffde46cbf97ed90584d8c10bdc6bae8094784387.zip
Now that new style rc.d scripts are being run as part of the
base rcorder, hard coded variable values in these scripts are overriding the values in /etc/rc.conf[.local] (due to the way that variables from the latter are read at boot time). Therefore, change the boot scripts to set default values only if the variable is unset in /etc/rc.conf[.local]. This will allow the service to start at boot time if it's been enabled as the user would expect. This change will be a noop for users who have systems that have not yet been upgraded to the new rc.d code in the base. In many cases there are other variables in the scripts that should get similar treatment, however I did not change anything other than the _enable lines. I'll leave the rest up to the maintainers to do as they see fit. Bump PORTREVISION to make sure that users and packages pick up this change.
Notes
Notes: svn path=/head/; revision=152963
Diffstat (limited to 'sysutils/usermin/files')
-rw-r--r--sysutils/usermin/files/usermin.sh.in2
-rw-r--r--sysutils/usermin/files/usermin.sh.sample2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysutils/usermin/files/usermin.sh.in b/sysutils/usermin/files/usermin.sh.in
index 4aadd72b5513..af9e7fe2f72f 100644
--- a/sysutils/usermin/files/usermin.sh.in
+++ b/sysutils/usermin/files/usermin.sh.in
@@ -11,7 +11,7 @@
# usermin_enable="YES"
#
-usermin_enable="NO"
+usermin_enable="${usermin_enable-NO}"
. %%RC_SUBR%%
diff --git a/sysutils/usermin/files/usermin.sh.sample b/sysutils/usermin/files/usermin.sh.sample
index 4aadd72b5513..af9e7fe2f72f 100644
--- a/sysutils/usermin/files/usermin.sh.sample
+++ b/sysutils/usermin/files/usermin.sh.sample
@@ -11,7 +11,7 @@
# usermin_enable="YES"
#
-usermin_enable="NO"
+usermin_enable="${usermin_enable-NO}"
. %%RC_SUBR%%