Merge pull request #5554 from ttarabul/devel

Use /etc/rc.conf.local for sevice configuration on FreeBSD

Merge pull request #5554 from ttarabul/devel
Use /etc/rc.conf.local for sevice configuration on FreeBSD
5967b463 · jctanner · 5fafc610 · 2f813f76 · 5967b463
Commit 5967b463 authored Feb 04, 2014 by jctanner
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

library/system/service
+1 -1

No files found.
--- a/library/system/service
+++ b/library/system/service
@@ -784,7 +784,7 @@ class FreeBsdService(Service):
        else:
            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:
            if os.path.isfile(rcfile):
                self.rcconf_file = rcfile