From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 584C813832E for ; Tue, 19 Jul 2016 22:34:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FA67E0AE6; Tue, 19 Jul 2016 22:34:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 900C0E0AE6 for ; Tue, 19 Jul 2016 22:34:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D80F1340D1C for ; Tue, 19 Jul 2016 22:34:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FE2178D for ; Tue, 19 Jul 2016 22:34:02 +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: <1468963308.daf93977641201f16c477b075ce9055a1da8f7b3.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/Makefile init.d/sysctl.BSD.in init.d/sysctl.GNU-kFreeBSD.in init.d/sysctl.GNU.in init.d/sysctl.Linux.in init.d/sysctl.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: daf93977641201f16c477b075ce9055a1da8f7b3 X-VCS-Branch: master Date: Tue, 19 Jul 2016 22:34:02 +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: 0ffeccc0-67a3-48b2-8fb6-693591fa9209 X-Archives-Hash: ab14de66dc8de2cacfc79fac45d21b57 commit: daf93977641201f16c477b075ce9055a1da8f7b3 Author: William Hubbs gmail com> AuthorDate: Tue Jul 19 20:56:06 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jul 19 21:21:48 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=daf93977 init.d: combine sysctl scripts We had separate sysctl scripts for each operating system. However, there is no need to do this since we can detect the operating system at runtime with $RC_UNAME. init.d/Makefile | 3 --- init.d/sysctl.GNU-kFreeBSD.in | 38 ------------------------------------ init.d/sysctl.GNU.in | 39 ------------------------------------- init.d/sysctl.Linux.in | 26 ------------------------- init.d/{sysctl.BSD.in => sysctl.in} | 27 +++++++++++++++++++++---- 5 files changed, 23 insertions(+), 110 deletions(-) diff --git a/init.d/Makefile b/init.d/Makefile index 55db3d1..a44c4e6 100644 --- a/init.d/Makefile +++ b/init.d/Makefile @@ -31,9 +31,6 @@ SRCS-NetBSD= hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \ # These are NetBSD specific SRCS-NetBSD+= devdb.in swap-blk.in ttys.in wscons.in -%.in: %${SFX} - sed ${SED_REPLACE} ${SED_EXTRA} $< > $@ - include ${MK}/scripts.mk _installafter_: realinstall diff --git a/init.d/sysctl.GNU-kFreeBSD.in b/init.d/sysctl.GNU-kFreeBSD.in deleted file mode 100644 index 7097d47..0000000 --- a/init.d/sysctl.GNU-kFreeBSD.in +++ /dev/null @@ -1,38 +0,0 @@ -#!@SBINDIR@/openrc-run -# Copyright (c) 2007-2015 The OpenRC Authors. -# See the Authors file at the top-level directory of this distribution and -# https://github.com/OpenRC/openrc/blob/master/AUTHORS -# -# This file is part of OpenRC. It is subject to the license terms in -# the LICENSE file found in the top-level directory of this -# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE -# This file may not be copied, modified, propagated, or distributed -# except according to the terms contained in the LICENSE file. - -depend() -{ - before bootmisc logger - keyword -prefix -} - -start() -{ - [ -e /etc/sysctl.conf ] || return 0 - local retval=0 var= comments= conf= - ebegin "Configuring kernel parameters" - eindent - for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do - if [ -r "$conf" ]; then - vebegin "applying $conf" - while read var comments; do - case "$var" in - ""|"#"*) continue;; - esac - sysctl -w "$var" >/dev/null || retval=1 - done < "$conf" - veend $retval - fi - done - eoutdent - eend $retval "Some errors were encountered" -} diff --git a/init.d/sysctl.GNU.in b/init.d/sysctl.GNU.in deleted file mode 100644 index be7b42e..0000000 --- a/init.d/sysctl.GNU.in +++ /dev/null @@ -1,39 +0,0 @@ -#!@PREFIX@/sbin/openrc-run -# Copyright (c) 2007-2015 The OpenRC Authors. -# See the Authors file at the top-level directory of this distribution and -# https://github.com/OpenRC/openrc/blob/master/AUTHORS -# -# This file is part of OpenRC. It is subject to the license terms in -# the LICENSE file found in the top-level directory of this -# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE -# This file may not be copied, modified, propagated, or distributed -# except according to the terms contained in the LICENSE file. -#FIXME: Modify for GNU/Hurd - -depend() -{ - before bootmisc logger - keyword -prefix -} - -start() -{ - [ -e /etc/sysctl.conf ] || return 0 - local retval=0 var= comments= conf= - ebegin "Configuring kernel parameters" - eindent - for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do - if [ -r "$conf" ]; then - vebegin "applying $conf" - while read var comments; do - case "$var" in - ""|"#"*) continue;; - esac - sysctl -w "$var" >/dev/null || retval=1 - done < "$conf" - veend $retval - fi - done - eoutdent - eend $retval "Some errors were encountered" -} diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in deleted file mode 100644 index f5e0ab6..0000000 --- a/init.d/sysctl.Linux.in +++ /dev/null @@ -1,26 +0,0 @@ -#!@SBINDIR@/openrc-run -# Copyright (c) 2007-2015 The OpenRC Authors. -# See the Authors file at the top-level directory of this distribution and -# https://github.com/OpenRC/openrc/blob/master/AUTHORS -# -# This file is part of OpenRC. It is subject to the license terms in -# the LICENSE file found in the top-level directory of this -# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE -# This file may not be copied, modified, propagated, or distributed -# except according to the terms contained in the LICENSE file. - -depend() -{ - before bootmisc logger - keyword -prefix -systemd-nspawn -vserver -} - -start() -{ - local quiet - yesno $rc_verbose || quiet=-q - - ebegin "Configuring kernel parameters" - sysctl ${quiet} --system - eend $? "Unable to configure some kernel parameters" -} diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.in similarity index 75% rename from init.d/sysctl.BSD.in rename to init.d/sysctl.in index 7097d47..05f5c4c 100644 --- a/init.d/sysctl.BSD.in +++ b/init.d/sysctl.in @@ -12,14 +12,13 @@ depend() { before bootmisc logger - keyword -prefix + keyword -prefix -systemd-nspawn -vserver } -start() +BSD_sysctl() { [ -e /etc/sysctl.conf ] || return 0 local retval=0 var= comments= conf= - ebegin "Configuring kernel parameters" eindent for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do if [ -r "$conf" ]; then @@ -34,5 +33,25 @@ start() fi done eoutdent - eend $retval "Some errors were encountered" + return $retval +} + +Linux_sysctl() +{ + local quiet + yesno $rc_verbose || quiet=-q + + sysctl ${quiet} --system +} + +start() +{ + local rc=0 + + ebegin "Configuring kernel parameters" + case $RC_UNAME" in + *BSD|GNU) BSD_sysctl; rc=$? ;; + Linux) Linux_sysctl; rc=$? ;; + esac + eend $rc "Unable to configure some kernel parameters" }