Merge pull request #5554 from ttarabul/devel

Use /etc/rc.conf.local for sevice configuration on FreeBSD
This commit is contained in:
jctanner 2014-02-04 10:59:19 -08:00
commit 4901af0ef6

View file

@ -784,7 +784,7 @@ class FreeBsdService(Service):
else: else:
self.rcconf_value = "NO" self.rcconf_value = "NO"
rcfiles = [ '/etc/rc.conf','/usr/local/etc/rc.conf' ] rcfiles = [ '/etc/rc.conf','/etc/rc.conf.local', '/usr/local/etc/rc.conf' ]
for rcfile in rcfiles: for rcfile in rcfiles:
if os.path.isfile(rcfile): if os.path.isfile(rcfile):
self.rcconf_file = rcfile self.rcconf_file = rcfile