aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile57
1 files changed, 14 insertions, 43 deletions
diff --git a/Makefile b/Makefile
index 4dc10680..d0088c8e 100644
--- a/Makefile
+++ b/Makefile
@@ -20,25 +20,22 @@ 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 $(ROOT)/sbin
install -m644 lang.csh $(ROOT)/etc/profile.d/10lang.csh
install -m644 lang.sh $(ROOT)/etc/profile.d/10lang.sh
+ install -m644 term256.csh $(ROOT)/etc/profile.d/10term256.csh
+ install -m644 term256.sh $(ROOT)/etc/profile.d/10term256.sh
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
- 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
@@ -46,11 +43,11 @@ install:
install -m755 display-manager-failure-message $(ROOT)/usr/bin/display-manager-failure-message
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
+ # (cg) Are the two lines below needed these days???
mkdir -p $(ROOT)/etc/sysconfig/console/consolefonts
mkdir -p $(ROOT)/etc/sysconfig/console/consoletrans
mkdir -p $(ROOT)/lib/systemd/
@@ -66,18 +63,8 @@ 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
- 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
- #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 ; \
@@ -112,21 +99,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
@@ -138,6 +110,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
ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants
@@ -145,19 +118,17 @@ install:
ln -s ../mandriva-save-dmesg.service $(ROOT)/lib/systemd/system/basic.target.wants
ln -s ../mandriva-everytime.service $(ROOT)/lib/systemd/system/basic.target.wants
- mkdir -p $(ROOT)/etc/tmpfiles.d
- install -m 644 initscripts.tmpfiles.d $(ROOT)/etc/tmpfiles.d/initscripts.conf
- install -m 644 mandriva.tmpfiles.d $(ROOT)/etc/tmpfiles.d/mandriva.conf
+ mkdir -p $(ROOT)/lib/tmpfiles.d
+ install -m 644 initscripts.tmpfiles.d $(ROOT)/lib/tmpfiles.d/initscripts.conf
+ install -m 644 mandriva.tmpfiles.d $(ROOT)/lib/tmpfiles.d/mandriva.conf
# These are LSB compatibility symlinks. At some point in the future
# the actual files will be here instead of symlinks
for i in 0 1 2 3 4 5 6 S ; 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
syntax-check:
for afile in `find . -type f -perm +111|grep -v \.csh | grep -v .git | grep -v po/ | grep -v 'gprintify.py' ` ; do \