From da25360fd3559f2f6ad9f56d9255ac48ee95f325b83ff481214015cc87496877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 6 May 2011 14:37:33 +0000 Subject: [PATCH] Accepting request 69787 from home:jeff_mahoney:branches:Base:System - boot.sysctl: Add support for loading defaults from /boot/sysctl.conf-$(uname -r) before loading /etc/sysctl.conf to allow each kernel flavor to adjust defaults without different kernel configuration options. The HEAD kernel has support for generating these files now. OBS-URL: https://build.opensuse.org/request/show/69787 OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=44 --- boot.sysctl | 8 ++++++++ procps.changes | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/boot.sysctl b/boot.sysctl index 044af16..131af39 100644 --- a/boot.sysctl +++ b/boot.sysctl @@ -24,6 +24,14 @@ rc_reset case "$1" in start) + + # Load per-kernel defaults from /boot. This file is provided + # by the kernel package and will be replaced on update. + if test -e "/boot/sysctl.conf-$(uname -r)"; then + echo -n "Loading sysctl defaults from /boot/sysctl.conf-$(uname -r)" + sysctl -e -q -p /boot/sysctl.conf-$(uname -r) + rc_status -v -r + fi # # run sysctl if the config file exists # otherwise generate it diff --git a/procps.changes b/procps.changes index af1c548..a0d14f6 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 5 17:49:30 CEST 2011 - jeffm@suse.de + +- boot.sysctl: Add support for loading defaults from + /boot/sysctl.conf-$(uname -r) before loading /etc/sysctl.conf + to allow each kernel flavor to adjust defaults without + different kernel configuration options. + ------------------------------------------------------------------- Tue Mar 22 17:31:22 UTC 2011 - idoenmez@novell.com