From 231d3e4ec98e3792519ffbe7f081e592ec31fdff Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 18 Oct 2012 16:05:51 -0400 Subject: Add a default /etc/sysctl.conf that describes how to change values, and where the defaults now live. (#760254) --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cc3231b2..e8f3fb58 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ install: 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 install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig cp -af rc.d/init.d $(ROOT)/etc/rc.d/ -- cgit v1.2.1 From 6091b58b60f532d8e3f317b99f7ea85d99853db3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 31 Oct 2012 13:31:48 -0400 Subject: Drop fedora-storage-init; conflict with older lvm & dmraid so we get the required versions that allow us to do so. () --- Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e8f3fb58..233ab00a 100644 --- a/Makefile +++ b/Makefile @@ -96,8 +96,6 @@ install: 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 mkdir -p $(ROOT)/lib/tmpfiles.d install -m 644 initscripts.tmpfiles.d $(ROOT)/lib/tmpfiles.d/initscripts.conf -- cgit v1.2.1 From daaf1b7eb9aad6b3410c8992e0b3991854e1de87 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 7 Dec 2012 15:12:36 -0500 Subject: Complete setsysfont removal. --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 233ab00a..1c6bce8a 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,6 @@ install: install -m644 adjtime $(ROOT)/etc 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 install -m644 term256.csh term256.sh $(ROOT)/etc/profile.d install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d -- cgit v1.2.1 From 65173d72f1a662a8596aa0e14232556ba40e452f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 7 Dec 2012 16:21:59 -0500 Subject: Fix build. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1c6bce8a..c6fc7a0a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ install: install -m644 adjtime $(ROOT)/etc install -m644 inittab $(ROOT)/etc install -m644 rwtab statetab networks $(ROOT)/etc + install -m755 service $(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 -- cgit v1.2.1 From 9a0f402caa2dd711d9f24ee9e28e90682d904795 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 3 Jan 2013 14:20:07 -0500 Subject: Rename term256 to 256term (glob sort) (#849429) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c6fc7a0a..ea16f2b8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ install: install -m644 rwtab statetab networks $(ROOT)/etc install -m755 service $(ROOT)/sbin install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d - install -m644 term256.csh term256.sh $(ROOT)/etc/profile.d + install -m644 256term.csh 256term.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 From ec49b3efa64a4e964e39dd443fc24deba47c7df3 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 7 Mar 2013 14:06:54 +0100 Subject: move stuff directly to /usr (#905492) --- Makefile | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ea16f2b8..9ac75018 100644 --- a/Makefile +++ b/Makefile @@ -13,16 +13,16 @@ all: make -C po install: - mkdir -p $(ROOT)/etc/profile.d $(ROOT)/sbin $(ROOT)/usr/sbin + mkdir -p $(ROOT)/etc/profile.d $(ROOT)/usr/sbin mkdir -p $(ROOT)$(mandir)/man{5,8} mkdir -p $(ROOT)/etc/rwtab.d $(ROOT)/etc/statetab.d mkdir -p $(ROOT)/var/lib/stateless/writable mkdir -p $(ROOT)/var/lib/stateless/state install -m644 adjtime $(ROOT)/etc - install -m644 inittab $(ROOT)/etc + install -m644 inittab $(ROOT)/etc install -m644 rwtab statetab networks $(ROOT)/etc - install -m755 service $(ROOT)/sbin + install -m755 service $(ROOT)/usr/sbin install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d install -m644 256term.csh 256term.sh $(ROOT)/etc/profile.d install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d @@ -41,11 +41,11 @@ install: 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 $(ROOT)/etc - mkdir -p $(ROOT)/lib/systemd/ - cp -af systemd/* $(ROOT)/lib/systemd/ + mkdir -p $(ROOT)/usr/lib/systemd/ + cp -af systemd/* $(ROOT)/usr/lib/systemd/ mkdir -p $(ROOT)/etc/ppp/peers - mkdir -p $(ROOT)/lib - cp -af udev $(ROOT)/lib + mkdir -p $(ROOT)/usr/lib + cp -af udev $(ROOT)/usr/lib chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/* chmod 644 $(ROOT)/etc/rc.d/init.d/functions chmod 755 $(ROOT)/etc/ppp/peers @@ -60,13 +60,13 @@ install: install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \ fi - mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin - mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/sbin + mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/usr/sbin + mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/usr/sbin (cd $(ROOT)/etc/sysconfig/network-scripts; \ ln -sf ifup-ippp ifup-isdn ; \ ln -sf ifdown-ippp ifdown-isdn ; \ - ln -sf ../../../sbin/ifup . ; \ - ln -sf ../../../sbin/ifdown . ) + ln -sf ../../../usr/sbin/ifup . ; \ + ln -sf ../../../usr/sbin/ifdown . ) make install ROOT=$(ROOT) mandir=$(mandir) -C src make install PREFIX=$(ROOT) -C po @@ -84,21 +84,21 @@ install: done # Can't store symlinks in a CVS archive - 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 - mkdir -p -m 755 $(ROOT)/lib/systemd/system/local-fs.target.wants - mkdir -p -m 755 $(ROOT)/lib/systemd/system/basic.target.wants - mkdir -p -m 755 $(ROOT)/lib/systemd/system/sysinit.target.wants - ln -s ../fedora-configure.service $(ROOT)/lib/systemd/system/basic.target.wants - ln -s ../fedora-loadmodules.service $(ROOT)/lib/systemd/system/basic.target.wants - 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 - - mkdir -p $(ROOT)/lib/tmpfiles.d - install -m 644 initscripts.tmpfiles.d $(ROOT)/lib/tmpfiles.d/initscripts.conf + mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/multi-user.target.wants + mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/graphical.target.wants + ln -s reboot.target $(ROOT)/usr/lib/systemd/system/ctrl-alt-del.target + mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/local-fs.target.wants + mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/basic.target.wants + mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/sysinit.target.wants + ln -s ../fedora-configure.service $(ROOT)/usr/lib/systemd/system/basic.target.wants + ln -s ../fedora-loadmodules.service $(ROOT)/usr/lib/systemd/system/basic.target.wants + ln -s ../fedora-autorelabel.service $(ROOT)/usr/lib/systemd/system/basic.target.wants + ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants + ln -s ../fedora-readonly.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants + ln -s ../fedora-import-state.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants + + mkdir -p $(ROOT)/usr/lib/tmpfiles.d + install -m 644 initscripts.tmpfiles.d $(ROOT)/usr/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 20f84b5fbd33e5ec8790284a158f31b58ed4c241 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 28 May 2013 15:17:45 +0200 Subject: ctrl-alt-delete.target is provided by systemd package --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9ac75018..97065a9c 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,6 @@ install: # Can't store symlinks in a CVS archive mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/multi-user.target.wants mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/graphical.target.wants - ln -s reboot.target $(ROOT)/usr/lib/systemd/system/ctrl-alt-del.target mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/local-fs.target.wants mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/basic.target.wants mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/sysinit.target.wants -- cgit v1.2.1 From b873be923e1ba63b0cbd98aee317d34964b42280 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 16 Aug 2013 08:13:35 +0200 Subject: symlink /etc/sysctl.conf -> /etc/sysctl.d/ --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') 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/ -- cgit v1.2.1