From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 10E401384B4 for ; Wed, 9 Dec 2015 18:42:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46B9921C013; Wed, 9 Dec 2015 18:42:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E306021C013 for ; Wed, 9 Dec 2015 18:42:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5777C34074D for ; Wed, 9 Dec 2015 18:42:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31C11A3F for ; Wed, 9 Dec 2015 18:42:33 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1449686290.cc9c23c8484ea7d07b1f8e54bcab46cc31ec727d.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/gendepends.sh.in sh/init.sh.BSD.in sh/init.sh.Linux.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: cc9c23c8484ea7d07b1f8e54bcab46cc31ec727d X-VCS-Branch: master Date: Wed, 9 Dec 2015 18:42:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 24fa6e4e-7615-4758-b7ad-923d76a9759b X-Archives-Hash: 9e8f568c4c44aff132333cbe34ce9141 commit: cc9c23c8484ea7d07b1f8e54bcab46cc31ec727d Author: William Hubbs gmail com> AuthorDate: Wed Dec 9 18:38:10 2015 +0000 Commit: William Hubbs gentoo 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