aboutsummaryrefslogtreecommitdiffstats
path: root/initscripts.spec
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2012-04-20 15:01:24 -0400
committerBill Nottingham <notting@redhat.com>2012-04-20 15:01:24 -0400
commitf4852e09cd32f33b0c496864171d8dc9e85bd0cf (patch)
treee12d9dcf8104367d264534cbf8ac9365b6026211 /initscripts.spec
parentfa2911a4dc5cc793f495b39d9c71bbcc29ff011b (diff)
downloadinitscripts-f4852e09cd32f33b0c496864171d8dc9e85bd0cf.tar
initscripts-f4852e09cd32f33b0c496864171d8dc9e85bd0cf.tar.gz
initscripts-f4852e09cd32f33b0c496864171d8dc9e85bd0cf.tar.bz2
initscripts-f4852e09cd32f33b0c496864171d8dc9e85bd0cf.tar.xz
initscripts-f4852e09cd32f33b0c496864171d8dc9e85bd0cf.zip
Move default sysctl.conf to /usr/lib/sysctl.d, adjust things accordingly. (#760254)
Also, update apply_sysctl to 1) use systemd-sysctl if it's there 2) imitate it if it's not.
Diffstat (limited to 'initscripts.spec')
-rw-r--r--initscripts.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index deff3640..72c3d180 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -258,7 +258,7 @@ rm -rf $RPM_BUILD_ROOT
%exclude /etc/rc.d/init.d/reboot
%exclude /etc/rc.d/init.d/single
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local
-%config(noreplace) /etc/sysctl.conf
+/usr/lib/sysctl.d/00-system.conf
%exclude /etc/profile.d/debug*
/etc/profile.d/*
/usr/sbin/sys-unconfig