[gentoo-commits] proj/openrc:master commit in: sh/

[William Hubbs]

commit:     cc9c23c8484ea7d07b1f8e54bcab46cc31ec727d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 18:38:10 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 18:38:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=cc9c23c8

Complete support for rc.conf.d

- gendepends.sh needs to read this directory to allow dependencies to be
  overridden
  - init.sh for Linux and Bsd need to read it to allow config settings
    they use to be overridden.

 sh/gendepends.sh.in | 5 +++++
 sh/init.sh.BSD.in   | 5 +++++
 sh/init.sh.Linux.in | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/sh/gendepends.sh.in b/sh/gendepends.sh.in
index 2ab798d..79a4bff 100644
--- a/sh/gendepends.sh.in
+++ b/sh/gendepends.sh.in
@@ -96,6 +96,11 @@ do
                fi
 
                [ -e @SYSCONFDIR@/rc.conf ] && . @SYSCONFDIR@/rc.conf
+               if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
+                       for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
+                               [ -e "$_f" ] && . "$_f"
+                       done
+               fi
 
                if . "$_dir/$RC_SVCNAME"; then
                        echo "$RC_SVCNAME" >&3

diff --git a/sh/init.sh.BSD.in b/sh/init.sh.BSD.in
index 2a53dcd..5912a95 100644
--- a/sh/init.sh.BSD.in
+++ b/sh/init.sh.BSD.in
@@ -23,6 +23,11 @@ mount_svcdir()
 
 . "$RC_LIBEXECDIR"/sh/functions.sh
 [ -r "@SYSCONFDIR@/rc.conf" ] && . "@SYSCONFDIR@/rc.conf"
+if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
+       for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
+               [ -r "$_f" ] && . "$_f"
+       done
+fi
 
 # Disable devd until we need it
 if [ -z "$RC_SYS" -a "$RC_UNAME" = "FreeBSD" ]; then

diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
index a8ee69e..7d36e7a 100644
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -5,6 +5,11 @@
 
 . "$RC_LIBEXECDIR"/sh/functions.sh
 [ -r "@SYSCONFDIR@/rc.conf" ] && . "@SYSCONFDIR@/rc.conf"
+if [ -d "@SYSCONFDIR@/rc.conf.d" ]; then
+       for _f in "@SYSCONFDIR@"/rc.conf.d/*.conf; do
+               [ -e "$_f" ] && . "$_f"
+       done
+fi
 
 # By default VServer already has /proc mounted, but OpenVZ does not!
 # However, some of our users have an old proc image in /proc