From b873be923e1ba63b0cbd98aee317d34964b42280 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Fri, 16 Aug 2013 08:13:35 +0200
Subject: symlink /etc/sysctl.conf -> /etc/sysctl.d/

---
 Makefile         | 2 ++
 initscripts.spec | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 97065a9c..7d1eff56 100644
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,14 @@ install:
 	install -m755  sys-unconfig $(ROOT)/usr/sbin
 	install -m644  service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8
 	mkdir -p -m 755 $(ROOT)/usr/lib/sysctl.d
+	mkdir -p -m 755 $(ROOT)/etc/sysctl.d
 	install -m644 sysctl.conf $(ROOT)/usr/lib/sysctl.d/00-system.conf
 	if uname -m | grep -q sparc ; then \
 	  install -m644 sysctl.conf.sparc $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
 	if uname -m | grep -q s390 ; then \
 	  install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
 	install -m 644 sysctl.conf.README $(ROOT)/etc/sysctl.conf
+	ln -s ../sysctl.conf $(ROOT)/etc/sysctl.d/99-sysctl.conf
 
 	install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
diff --git a/initscripts.spec b/initscripts.spec
index 4952efa6..fac81b7d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -173,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
+/etc/sysctl.d/99-sysctl.conf
 %exclude /etc/profile.d/debug*
 /etc/profile.d/*
 /usr/sbin/sys-unconfig
-- 
cgit v1.2.1