From c073438d403c78f11c8e792c69e046736640b8c3 Mon Sep 17 00:00:00 2001 From: Tyler Date: Wed, 8 Jan 2014 13:48:11 -0500 Subject: [PATCH 1/2] Use /etc/rc.conf.local for sevice configuration on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit /etc/rc.conf.local is the preferred location for system-specific startup configuration, and /usr/local/etc/rc.conf generally isn’t used. see: http://www.freebsd.org/doc/handbook/configtuning-core-configuration.html --- system/service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/service b/system/service index ed5712c09f9..66ef909ef36 100644 --- a/system/service +++ b/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' ] # prefer /etc/rc.conf.local if it exists for rcfile in rcfiles: if os.path.isfile(rcfile): self.rcconf_file = rcfile From 5ce664b49927a22316a0c1a1bf76892af76c3756 Mon Sep 17 00:00:00 2001 From: Tyler Date: Wed, 8 Jan 2014 14:38:49 -0500 Subject: [PATCH 2/2] keep /usr/local/etc/rc.conf for backwards compatibility --- system/service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/service b/system/service index 66ef909ef36..109d0ca52f2 100644 --- a/system/service +++ b/system/service @@ -784,7 +784,7 @@ class FreeBsdService(Service): else: self.rcconf_value = "NO" - rcfiles = [ '/etc/rc.conf','/etc/rc.conf.local' ] # prefer /etc/rc.conf.local if it exists + 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