From cb42a762e69037502d0549d3a79a41e292af8aad Mon Sep 17 00:00:00 2001 From: Will Woods Date: Thu, 8 Mar 2012 15:13:03 -0500 Subject: add fedora-import-state.service This service imports the contents of /run/initramfs/state into the root filesystem, where the root filesystem is writeable. This allows dracut to hand the ifcfg file and dhclient lease over to NetworkManager on network-booted Live images. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 00e81b0c..3d1ae951 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,7 @@ install: ln -s ../fedora-autorelabel.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel-mark.service $(ROOT)/lib/systemd/system/basic.target.wants ln -s ../fedora-readonly.service $(ROOT)/lib/systemd/system/local-fs.target.wants + ln -s ../fedora-import-state.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants -- cgit v1.2.1 From f4852e09cd32f33b0c496864171d8dc9e85bd0cf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 20 Apr 2012 15:01:24 -0400 Subject: 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. --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3d1ae951..688c510b 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.1 From 5d91d38c8c9b81db56dcd94cf5c470b0dce68da0 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 14 Jun 2012 16:54:50 +0200 Subject: service: add support for legacy custom actions This adds support for legacy initscript actions such as service iptables save Packages wishing to provide legacy actions should install programs (probably scripts, but could be binaries) named /usr/libexec/initscripts/legacy-actions// It should be emphasized that this feature is meant to be used only in packages where compatibility of custom actions with previous releases is desired. Adding of entirely new actions is discouraged. Useful tools should be shipped by upstreams as programs in /usr/bin, not in distro-specific hacks. [ Modifications from original : change from /usr/lib to /usr/libexec - notting ] https://bugzilla.redhat.com/show_bug.cgi?id=796663 --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 688c510b..87aad620 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,7 @@ install: ln -s rc.d/$$i $(ROOT)/etc/$$i; \ done + mkdir -p -m 755 $(ROOT)/usr/libexec/initscripts/legacy-actions syntax-check: -- cgit v1.2.1 From e7369a6ad7353f47a7b317b7563b36362d575203 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 29 Jun 2012 16:28:04 -0400 Subject: 9.39-1 --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 87aad620..54b9a390 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,6 @@ install: install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d install -m755 sys-unconfig $(ROOT)/usr/sbin - install -m644 crypttab.5 $(ROOT)$(mandir)/man5 install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8 mkdir -p -m 755 $(ROOT)/usr/lib/sysctl.d install -m644 sysctl.conf $(ROOT)/usr/lib/sysctl.d/00-system.conf -- cgit v1.2.1 From 164d1ede7161233a2a2fe6e4cf413b44a08923e4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 16 Jul 2012 12:03:04 -0400 Subject: Use /lib/tmpfiles.d, not /etc/tmpfiles.d (#840182) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 54b9a390..55c6fc99 100644 --- a/Makefile +++ b/Makefile @@ -131,8 +131,8 @@ install: ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants - mkdir -p $(ROOT)/etc/tmpfiles.d - install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf + mkdir -p $(ROOT)/lib/tmpfiles.d + install -m 644 initscripts.tmpfiles.d $(ROOT)/lib/tmpfiles.d/initscripts.conf # These are LSB compatibility symlinks. At some point in the future # the actual files will be here instead of symlinks -- cgit v1.2.1 From d85174edb7389f670705595804b48aee0278ed2f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Aug 2012 15:18:23 -0400 Subject: Initial removal of support for non-systemd systems. --- Makefile | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 55c6fc99..89706260 100644 --- a/Makefile +++ b/Makefile @@ -20,12 +20,7 @@ install: mkdir -p $(ROOT)/var/lib/stateless/state install -m644 adjtime $(ROOT)/etc - install -m644 inittab $(ROOT)/etc/inittab.sysv - if uname -m | grep -q s390 ; then \ - install -m644 inittab.s390 $(ROOT)/etc/inittab.sysv ; \ - fi - install -m644 inittab.upstart $(ROOT)/etc/inittab.upstart - install -m644 inittab.systemd $(ROOT)/etc/inittab.systemd + install -m644 inittab $(ROOT)/etc install -m644 rwtab statetab networks $(ROOT)/etc install -m755 service setsysfont $(ROOT)/sbin install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d @@ -43,11 +38,10 @@ install: install -m755 prefdm $(ROOT)/etc/X11/prefdm install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig - install -m755 rc.d/rc rc.d/rc.local rc.d/rc.sysinit $(ROOT)/etc/rc.d/ cp -af rc.d/init.d $(ROOT)/etc/rc.d/ install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/ cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/ - cp -af ppp NetworkManager init $(ROOT)/etc + cp -af ppp NetworkManager $(ROOT)/etc mkdir -p $(ROOT)/lib/systemd/ cp -af systemd/* $(ROOT)/lib/systemd/ mkdir -p $(ROOT)/etc/ppp/peers @@ -62,7 +56,6 @@ install: chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init* chmod 755 $(ROOT)/etc/sysconfig/network-scripts/net.hotplug chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport - chmod 644 $(ROOT)/etc/init/* mkdir -p $(ROOT)/etc/sysconfig/modules mkdir -p $(ROOT)/etc/sysconfig/networking/devices mkdir -p $(ROOT)/etc/sysconfig/networking/profiles/default @@ -101,21 +94,6 @@ install: done # Can't store symlinks in a CVS archive - ln -s ../init.d/killall $(ROOT)/etc/rc.d/rc0.d/S00killall - ln -s ../init.d/killall $(ROOT)/etc/rc.d/rc6.d/S00killall - - ln -s ../init.d/halt $(ROOT)/etc/rc.d/rc0.d/S01halt - ln -s ../init.d/halt $(ROOT)/etc/rc.d/rc6.d/S01reboot - - ln -s ../init.d/single $(ROOT)/etc/rc.d/rc1.d/S99single - - ln -s ../rc.local $(ROOT)/etc/rc.d/rc2.d/S99rc-local - ln -s ../rc.local $(ROOT)/etc/rc.d/rc3.d/S99rc-local - ln -s ../rc.local $(ROOT)/etc/rc.d/rc4.d/S99rc-local - ln -s ../rc.local $(ROOT)/etc/rc.d/rc5.d/S99rc-local - - ln -s halt $(ROOT)/etc/rc.d/init.d/reboot - mkdir -p -m 755 $(ROOT)/lib/systemd/system/multi-user.target.wants mkdir -p -m 755 $(ROOT)/lib/systemd/system/graphical.target.wants ln -s reboot.target $(ROOT)/lib/systemd/system/ctrl-alt-del.target @@ -139,9 +117,6 @@ install: for i in 0 1 2 3 4 5 6 ; do \ ln -s rc.d/rc$$i.d $(ROOT)/etc/rc$$i.d; \ done - for i in rc rc.sysinit rc.local ; do \ - ln -s rc.d/$$i $(ROOT)/etc/$$i; \ - done mkdir -p -m 755 $(ROOT)/usr/libexec/initscripts/legacy-actions -- cgit v1.2.1 From 031a9ddaf6e25fb92959d5c1d7198a69c6ea6fbd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Aug 2012 15:19:11 -0400 Subject: Drop net.hotplug --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 89706260..17313e21 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,6 @@ install: chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifup-* chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifdown-* chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init* - chmod 755 $(ROOT)/etc/sysconfig/network-scripts/net.hotplug chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport mkdir -p $(ROOT)/etc/sysconfig/modules mkdir -p $(ROOT)/etc/sysconfig/networking/devices -- cgit v1.2.1 From 929b86328048d17f30f9be1ec2161b6486827e7f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 2 Aug 2012 15:13:40 -0400 Subject: Drop more unused functions, and drop old s-c-n profile support directories. The profile support itself was removed a while ago. --- Makefile | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 17313e21..c209befa 100644 --- a/Makefile +++ b/Makefile @@ -56,14 +56,6 @@ install: chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init* chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport mkdir -p $(ROOT)/etc/sysconfig/modules - mkdir -p $(ROOT)/etc/sysconfig/networking/devices - mkdir -p $(ROOT)/etc/sysconfig/networking/profiles/default - #mv $(ROOT)/etc/sysconfig/network-scripts/ifcfg-lo \ - # $(ROOT)/etc/sysconfig/networking/devices - #ln -s ../networking/devices/ifcfg-lo \ - # $(ROOT)/etc/sysconfig/network-scripts/ifcfg-lo - #ln -s ../networking/devices/ifcfg-lo \ - # $(ROOT)/etc/sysconfig/networking/profiles/default/ifcfg-lo mkdir -p $(ROOT)/etc/sysconfig/console if uname -m | grep -q s390 ; then \ install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \ -- cgit v1.2.1 From 323b0fc34f98c5e666bdb8976eeaac795a14f07d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 8 Aug 2012 17:11:31 -0400 Subject: Drop prefdm. --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c209befa..e3be9e3e 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,6 @@ install: if uname -m | grep -q s390 ; then \ 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 - install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig cp -af rc.d/init.d $(ROOT)/etc/rc.d/ install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/ -- cgit v1.2.1 From 8d627ea4b403a8c291b3b26e5bf42af147da8717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Wed, 8 Aug 2012 21:56:17 +0100 Subject: Enable 256 color terminals by default --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e3be9e3e..cc3231b2 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ install: install -m644 rwtab statetab networks $(ROOT)/etc install -m755 service setsysfont $(ROOT)/sbin install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d + install -m644 term256.csh term256.sh $(ROOT)/etc/profile.d install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d install -m755 sys-unconfig $(ROOT)/usr/sbin install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8 -- cgit v1.2.1