Merge tag 'initscripts-9.41-1' into mga-41

Tag as initscripts-9.41-1

Conflicts:
	.gitignore
	Makefile
	inittab
	po/xgettext_sh.py
	prefdm
	rc.d/init.d/functions
	rc.d/init.d/halt
	rc.d/init.d/killall
	rc.d/init.d/netfs
	rc.d/init.d/network
	rc.d/init.d/single
	rc.d/rc
	rc.d/rc.local
	rc.d/rc.sysinit
	service
	src/console_check.c
	src/console_init.c
	sysconfig.txt
	sysconfig/network-scripts/ifdown
	sysconfig/network-scripts/ifdown-eth
	sysconfig/network-scripts/ifup
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ippp
	sysconfig/network-scripts/network-functions
	systemd/system/fedora-wait-storage.service
	udev/rules.d/10-console.rules

Merge Notes:
 1. prefdm: We are keeping the current prefdm script which parses
    /etc/sysconfig/desktop to find the current preferred dm. We also
    keep the hunk in sysconfig.txt which relates to the afore mentioned
    file. Longer term, we should drop this and move to per-dm units.
 2. sysconfig/network-scripts/ifup-ippp is still removed at our end...
    is there a replacement?
 3. I used our /sbin/service as it varies quite a lot from fedora. I'd
    be tempted to drop our custom version in favour of upstream
    (s/libexec/lib/)
 4. ifup/ifdown NM wrappers have been included - previously we just
    printed a "Device is manged by NM skipping.." message.

CONFLICT (modify/delete): udev/rules.d/10-console.rules deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of udev/rules.d/10-console.rules left in tree.
Auto-merging systemd/system/fedora-wait-storage.service
CONFLICT (content): Merge conflict in systemd/system/fedora-wait-storage.service
Auto-merging systemd/fedora-storage-init
Auto-merging sysconfig/network-scripts/network-functions
CONFLICT (content): Merge conflict in sysconfig/network-scripts/network-functions
Removing sysconfig/network-scripts/net.hotplug
Auto-merging sysconfig/network-scripts/ifup-sit
Auto-merging sysconfig/network-scripts/ifup-post
Auto-merging sysconfig/network-scripts/ifup-plusb
CONFLICT (modify/delete): sysconfig/network-scripts/ifup-ippp deleted in
HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of sysconfig/network-scripts/ifup-ippp left in tree.
Auto-merging sysconfig/network-scripts/ifup-eth
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup-eth
Auto-merging sysconfig/network-scripts/ifup
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifup
Auto-merging sysconfig/network-scripts/ifdown-sit
Auto-merging sysconfig/network-scripts/ifdown-post
Auto-merging sysconfig/network-scripts/ifdown-eth
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown-eth
Auto-merging sysconfig/network-scripts/ifdown
CONFLICT (content): Merge conflict in sysconfig/network-scripts/ifdown
Auto-merging sysconfig.txt
CONFLICT (content): Merge conflict in sysconfig.txt
Removing src/testdinit
Removing src/testd.c
Removing src/securetty.c
Removing src/securetty.8
Removing src/getkey.c
Removing src/getkey.1
Removing src/fstab-decode.c
Removing src/fstab-decode.8
CONFLICT (modify/delete): src/console_init.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_init.c left in tree.
CONFLICT (modify/delete): src/console_check.c deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of src/console_check.c left in tree.
Auto-merging service
CONFLICT (content): Merge conflict in service
CONFLICT (modify/delete): rc.d/rc.sysinit deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.sysinit left in tree.
CONFLICT (modify/delete): rc.d/rc.local deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc.local left in tree.
CONFLICT (modify/delete): rc.d/rc deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/rc left in tree.
CONFLICT (modify/delete): rc.d/init.d/single deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/single left in tree.
Auto-merging rc.d/init.d/network
CONFLICT (content): Merge conflict in rc.d/init.d/network
CONFLICT (modify/delete): rc.d/init.d/netfs deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/netfs left in tree.
Auto-merging rc.d/init.d/netconsole
CONFLICT (modify/delete): rc.d/init.d/killall deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/killall left in tree.
CONFLICT (modify/delete): rc.d/init.d/halt deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of rc.d/init.d/halt left in tree.
Auto-merging rc.d/init.d/functions
CONFLICT (content): Merge conflict in rc.d/init.d/functions
CONFLICT (modify/delete): prefdm deleted in initscripts-9.41-1 and modified in HEAD. Version HEAD of prefdm left in tree.
Auto-merging ppp/ip-up.ipv6to4
CONFLICT (modify/delete): po/xgettext_sh.py deleted in HEAD and modified in initscripts-9.41-1. Version initscripts-9.41-1 of po/xgettext_sh.py left in tree.
Removing inittab.upstart
Removing inittab.systemd
Removing inittab.s390
Auto-merging inittab
CONFLICT (content): Merge conflict in inittab
Removing init/tty.conf
Removing init/start-ttys.conf
Removing init/splash-manager.conf
Removing init/serial.conf
Removing init/rcS.conf
Removing init/rcS-sulogin.conf
Removing init/rc.conf
Removing init/quit-plymouth.conf
Removing init/prefdm.conf
Removing init/plymouth-shutdown.conf
Removing init/control-alt-delete.conf
Removing crypttab.5
Removing README-init
Removing NetworkManager/dispatcher.d/05-netfs
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

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 \