diff options
| author | Bill Nottingham <notting@redhat.com> | 2012-04-20 15:01:24 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2012-04-20 15:01:24 -0400 |
| commit | f4852e09cd32f33b0c496864171d8dc9e85bd0cf (patch) | |
| tree | e12d9dcf8104367d264534cbf8ac9365b6026211 /Makefile | |
| parent | fa2911a4dc5cc793f495b39d9c71bbcc29ff011b (diff) | |
| download | initscripts-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 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -33,11 +33,12 @@ install: install -m755 sys-unconfig $(ROOT)/usr/sbin install -m644 crypttab.5 $(ROOT)$(mandir)/man5 install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8 - install -m644 sysctl.conf $(ROOT)/etc/sysctl.conf + mkdir -p -m 755 $(ROOT)/usr/lib/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)/etc/sysctl.conf ; fi + 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)/etc/sysctl.conf ; fi + install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi mkdir -p $(ROOT)/etc/X11 install -m755 prefdm $(ROOT)/etc/X11/prefdm |