From 58a3a11440efdb847e0f4c762e11c5daf321465b Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 6 Aug 2014 22:01:30 -0500 Subject: [PATCH] sysctl.linux.in: use the --system option X-Gentoo-Bug: 484796 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=484796 --- init.d/sysctl.Linux.in | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in index cda86b5..12d3f19 100644 --- a/init.d/sysctl.Linux.in +++ b/init.d/sysctl.Linux.in @@ -10,25 +10,7 @@ depend() start() { - local conf= retval=0 err errs - ebegin "Configuring kernel parameters" - eindent - - for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do - if [ -r "$conf" ]; then - vebegin "applying $conf" - if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then - errs="${errs} ${err}" - sysctl -e -p "${conf}" >/dev/null - fi - veend $? || retval=1 - fi - done - - eoutdent - if [ ${retval} -eq 0 ] && [ -n "${errs}" ] ; then - ewarn "Unknown keys:${errs}" - fi - eend $retval "Some errors were encountered: ${errs}" + sysctl --system + eend $? "Unable to configure all parameters" } -- 1.8.5.5