From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBWnC-0005JY-AZ for garchives@archives.gentoo.org; Sat, 24 Mar 2012 19:38:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D18FE05CB; Sat, 24 Mar 2012 19:38:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CAAB1E05CB for ; Sat, 24 Mar 2012 19:38:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B1BB1B4024 for ; Sat, 24 Mar 2012 19:38:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F108CE5403 for ; Sat, 24 Mar 2012 19:38:11 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1332617828.09327f429fa8865c5a029dd4e9b029f5db1534e7.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/sysctl.BSD.in init.d/sysctl.Linux.in X-VCS-Directories: init.d/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 09327f429fa8865c5a029dd4e9b029f5db1534e7 X-VCS-Branch: master Date: Sat, 24 Mar 2012 19:38:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f7fd9133-4f01-4cd2-923a-84d7285f6c66 X-Archives-Hash: 42725cbdac82e966473b66bd5b3c0c39 commit: 09327f429fa8865c5a029dd4e9b029f5db1534e7 Author: William Hubbs gentoo org> AuthorDate: Sat Mar 24 19:37:08 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Mar 24 19:37:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D09327f42 Allow files in sysctl.d to override sysctl.conf reported-by: Peter Gantner (a.k.a. nephros) nephros.org> X-Gentoo-Bug: 406631 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=3D406631 --- init.d/sysctl.BSD.in | 2 +- init.d/sysctl.Linux.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in index 4a86f87..2bfd052 100644 --- a/init.d/sysctl.BSD.in +++ b/init.d/sysctl.BSD.in @@ -13,7 +13,7 @@ start() local retval=3D0 var=3D comments=3D conf=3D ebegin "Configuring kernel parameters" eindent - for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do + for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do if [ -r "$conf" ]; then vebegin "applying $conf" while read var comments; do diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in index 00b4c33..d202cb3 100644 --- a/init.d/sysctl.Linux.in +++ b/init.d/sysctl.Linux.in @@ -15,7 +15,7 @@ start() ebegin "Configuring kernel parameters" eindent =20 - for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do + for conf in /etc/sysctl.conf /etc/sysctl.d/*.conf; do if [ -r "$conf" ]; then vebegin "applying $conf" if ! err=3D$(sysctl -p "$conf" 2>&1 >/dev/null) ; then