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, 64 insertions, 122 deletions

diff --git a/initscripts.spec b/initscripts.spec
index 30731caa..0e850d2f 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,10 +1,6 @@
-%define _with_upstart 0
-%define _with_systemd 1
-%define _with_sysvinit 0
-
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.34
+Version: 9.41
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -12,51 +8,24 @@ Release: 1%{?dist}
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: mingetty, /bin/awk, /bin/sed, mktemp
+Obsoletes: initscripts-legacy <= 9.39
+Requires: /bin/awk, sed, coreutils
 Requires: /sbin/sysctl
-Requires: /sbin/fuser, /bin/grep
-Requires: /sbin/pidof, /sbin/blkid
+Requires: grep
 Requires: module-init-tools
-Requires: util-linux-ng >= 2.16
+Requires: util-linux >= 2.16
 Requires: bash >= 3.0
 Requires: sysvinit-tools >= 2.87-5
-%if %{_with_upstart}
-Conflicts: upstart < 0.6.0
-%if ! %{_with_systemd}
-Requires: upstart-sysvinit
-%endif
-%endif
-%if %{_with_systemd}
 Conflicts: systemd < 23-1
 Conflicts: systemd-units < 23-1
-%if ! %{_with_upstart}
-Requires: systemd-sysvinit
-%endif
-%endif
-%if %{_with_sysvinit}
-Requires: SysVinit >= 2.85-38
-%endif
-Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find
+Requires: systemd
+Requires: iproute, /sbin/arping, findutils
+# Not strictly required, but nothing else requires it
 Requires: /etc/system-release
-Requires: /sbin/runuser
 Requires: udev >= 125-1
 Requires: cpio
-Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9
-Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
-Conflicts: dhclient < 12:4.1.0-6
-Conflicts: tcsh < 6.13-5
-Conflicts: xorg-x11, glib2 < 2.11.1-2
-Conflicts: alsa-utils < 1.0.18
-Conflicts: plymouth < 0.7.0-0.2009.02.26
-Conflicts: s390utils < 2:1.8.2-11
-Conflicts: dmraid < 1.0.0.rc16-7, lvm2 < 2.02.65
-Conflicts: e2fsprogs < 1.15
-# http://bugzilla.redhat.com/show_bug.cgi?id=252973
-Conflicts: nut < 2.2.0
-Conflicts: NetworkManager < 1:0.8.0-12.git20100504
-Conflicts: libselinux < 2.1.0
+Requires: hostname
 Conflicts: ipsec-tools < 0.8.0-2
-Obsoletes: hotplug <= 3:2004_09_23-10.1
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
 Requires(preun): /sbin/chkconfig
@@ -68,15 +37,6 @@ your Red Hat or Fedora system, change runlevels, and shut the system down
 cleanly.  Initscripts also contains the scripts that activate and
 deactivate most network interfaces.
 
-%package legacy
-Summary: Support for legacy booting methods
-Requires: initscripts = %{version}-%{release}
-Group: System Environment/Base
-
-%description legacy
-The initscripts-legacy package contains basic scripts that may be
-required to boot the system using older init systems
-
 %package -n debugmode
 Summary: Scripts for running in debugging mode
 Requires: initscripts
@@ -100,29 +60,11 @@ make ROOT=$RPM_BUILD_ROOT SUPERUSER=`id -un` SUPERGROUP=`id -gn` mandir=%{_mandi
 
 %find_lang %{name}
 
-%if %{_with_systemd}
- mv -f $RPM_BUILD_ROOT/etc/inittab.systemd $RPM_BUILD_ROOT/etc/inittab
-%endif
-%if %{_with_upstart}
- mv -f $RPM_BUILD_ROOT/etc/inittab.upstart $RPM_BUILD_ROOT/etc/inittab
-%endif
-%if %{_with_sysvinit}
- mv -f $RPM_BUILD_ROOT/etc/inittab.sysv $RPM_BUILD_ROOT/etc/inittab
-%endif
-%if ! %{_with_upstart}
- rm -rf $RPM_BUILD_ROOT/etc/init
-%endif
-%if ! %{_with_systemd}
- rm -rf $RPM_BUILD_ROOT/lib/systemd
-%endif
-rm -f $RPM_BUILD_ROOT/etc/inittab.*
-
 %ifnarch s390 s390x
 rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
 %else
 rm -f \
- $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \
  $RPM_BUILD_ROOT/etc/sysconfig/init.s390
 %endif
 
@@ -142,18 +84,14 @@ chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
 chmod 664 /var/log/wtmp /var/run/utmp
 chmod 600 /var/log/btmp
 
-/sbin/chkconfig --add netfs
 /sbin/chkconfig --add network
 /sbin/chkconfig --add netconsole
-%if %{_with_systemd}
 if [ $1 -eq 1 ]; then
         /bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
-%endif
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/chkconfig --del netfs
   /sbin/chkconfig --del network
   /sbin/chkconfig --del netconsole
 fi
@@ -163,13 +101,10 @@ fi
 /sbin/chkconfig --del rawdevices
 exit 0
 
-%if %{_with_systemd}
 %postun
 if [ $1 -ge 1 ]; then
 	/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
-%endif
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -188,10 +123,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ifup
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/modules
-%dir /etc/sysconfig/networking
-%dir /etc/sysconfig/networking/devices
-%dir /etc/sysconfig/networking/profiles
-%dir /etc/sysconfig/networking/profiles/default
 /etc/sysconfig/network-scripts/network-functions
 /etc/sysconfig/network-scripts/network-functions-ipv6
 /etc/sysconfig/network-scripts/init.ipv6-global
@@ -220,7 +151,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/network-scripts/ifup-wireless
 /etc/sysconfig/network-scripts/ifup-isdn
 /etc/sysconfig/network-scripts/ifdown-isdn
-/etc/sysconfig/network-scripts/net.hotplug
 %ifarch s390 s390x
 /etc/sysconfig/network-scripts/ifup-ctc
 %endif
@@ -229,28 +159,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rwtab.d
 /etc/statetab
 %dir /etc/statetab.d
-%if %{_with_upstart}
-/etc/init/*
-%endif
-%if %{_with_systemd}
-/lib/systemd/*
+/lib/systemd/fedora-*
 /lib/systemd/system/*
-%endif
-%config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
 %dir /etc/rc.d
 %dir /etc/rc.d/rc[0-9].d
-%config(missingok) /etc/rc.d/rc[0-9].d/*
-%exclude /etc/rc.d/rc[0-9].d/*
 /etc/rc[0-9].d
 %dir /etc/rc.d/init.d
 /etc/rc.d/init.d/*
-%exclude /etc/rc.d/init.d/halt
-%exclude /etc/rc.d/init.d/killall
-%exclude /etc/rc.d/init.d/reboot
-%exclude /etc/rc.d/init.d/single
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local
-%config(noreplace) /etc/sysctl.conf
+/usr/lib/sysctl.d/00-system.conf
 %exclude /etc/profile.d/debug*
 /etc/profile.d/*
 /usr/sbin/sys-unconfig
@@ -259,14 +177,10 @@ rm -rf $RPM_BUILD_ROOT
 /bin/usleep
 %attr(4755,root,root) /usr/sbin/usernetctl
 /sbin/consoletype
-/sbin/fstab-decode
 /sbin/genhostid
-/sbin/getkey
-/sbin/securetty
 /sbin/sushell
 %attr(2755,root,root) /sbin/netreport
 /lib/udev/rules.d/*
-%exclude /lib/udev/rules.d/10-console.rules
 /lib/udev/rename_device
 /sbin/service
 /sbin/ppp-watch
@@ -283,32 +197,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/NetworkManager
 %dir /etc/NetworkManager/dispatcher.d
 /etc/NetworkManager/dispatcher.d/00-netreport
-/etc/NetworkManager/dispatcher.d/05-netfs
-%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init
+%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING
 /var/lib/stateless
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
-%dir /etc/tmpfiles.d
-/etc/tmpfiles.d/initscripts.conf
-
-%files legacy
-%defattr(-,root,root)
-%config(noreplace) /etc/inittab
-%dir /etc/rc.d
-%dir /etc/rc.d/rc[0-9].d
-%config(missingok) /etc/rc.d/rc[0-9].d/*
-/etc/rc[0-9].d
-/etc/rc
-%dir /etc/rc.d/init.d
-/etc/rc.sysinit
-/etc/rc.d/init.d/*
-/etc/rc.d/rc
-/etc/rc.d/rc.sysinit
-/lib/udev/rules.d/*
-/lib/udev/console_init
-/lib/udev/console_check
+%dir /lib/tmpfiles.d
+/lib/tmpfiles.d/initscripts.conf
+%dir /usr/libexec/initscripts/legacy-actions
 
 %files -n debugmode
 %defattr(-,root,root)
@@ -316,6 +213,51 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Fri Oct  5 2012 Bill Nottingham <notting@redhat.com> - 9.41-1
+- debugmode: MALLOC_CHECK_ is not thread safe. Don't enable it by default (#853175)
+- Add support for 256 color terminals (<pbrady@redhat.com>)
+- ifdown-eth: be less strict about VLAN name (#505314, <vpavlin@redhat.com>)
+- drop prefdm
+- ifup-eth: allow duplicate address detection to be disabled (<bcodding@uvm.edu>)
+- process rule6-* for sit devices (#840009, <lnykryn@redhat.com>)
+
+* Mon Aug  6 2012 Bill Nottingham <notting@redhat.com> - 9.40-1
+- drop support for booting non-systemd systems
+- drop legacy commands: getkey, fstab-decode, testd
+
+* Fri Jun 29 2012 Bill Nottingham <notting@redhat.com> - 9.39-1
+- assorted documentation cleanups
+- typo, spelling, licenese clean up (<ville.skytta@iki.fi>)
+- service: add support for legacy custom actions packaged in
+  /usr/libexec/initscripts/legacy-actions/<script>/<action>
+- network-functions: handle quoted HWADDR (#835372)
+- allow bridge names that start with '-' (<danken@redhat.com>)
+- remove all non-legacy uses of /sbin/route (#682308)
+- move default sysctl.conf to /usr/lib/sysctl.d (#760254)
+
+* Fri Mar 16 2012 Bill Nottingham <notting@redhat.com> - 9.37-1
+- Add support for firewalld zones (#802415, from <jpopelka@redhat.com>)
+
+* Mon Mar 12 2012 Bill Nottingham <notting@redhat.com> - 9.36-1
+- ifup-aliases: fix IFS usage mangling of device names (#802119)
+- ifup/ifdown: fix typo (#802055, <lubek@users.sourceforge.net>)
+
+* Fri Mar  9 2012 Bill Nottingham <notting@redhat.com> - 9.35-1
+- use the same DHCP lease file names as NetworkManager, where appropriate
+- copy network state from initramfs with a systemd service, not inline (<wwoods@redhat.com>)
+- sysconfig.txt: clean up section on disabling IPv6
+- ifup: allow for ifup-$TYPE/ifdown-$TYPE
+- fedora-readonly.service: drop StandardInput=tty (#785662)
+- sysconfig.txt: document additional ETHTOOL_OPTS enhancements (<raghusiddarth@gmail.com>)
+- port assorted ancient ifup-XYZ scripts away from ifconfig
+- don't use ifconfig in ifup-aliases (#721010, 588993, based on <tgummels@redhat.com>)
+- fedora-storage-init: handle dmraid sets with spaces (#728795, <lnykryn@redhat.com>)
+- fedora-readonly: don't exit with an error if SEinux isn't active. (#768628)
+- init.d/network: fix checks for network filesystems (#760018)
+- fedora-wait-storage: drop stdin/stdout/stderr (#735867)
+- netfs: move to legacy package
+- translation updates
+
 * Tue Oct 25 2011 Bill Nottingham <notting@redhat.com> - 9.34-1
 - read locale.conf if it exists (#706756)
 - ifdown: fix logic error with removing arp_ip_target (#745681)
@@ -338,7 +280,7 @@ rm -rf $RPM_BUILD_ROOT
 - ifdown-eth: fix dhclient pid file for IPv6 (#729292, <daveg@dgit.ndo.co.uk>)
 - move some more things to the legacy subpackage
 - netfs: don't mount gfs2 here (#689593)
-- readonly-root: add an empty CLIENTSTATE defintion (#725476)
+- readonly-root: add an empty CLIENTSTATE definition (#725476)
 - drop sysinit hack/unhack
 - ifup-eth: allow more options in ETHTOOL_OPTS (#692410, #693583)
 - rwtab: update for systemd (#704783)
@@ -676,7 +618,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix various issues with dmraid handling (#485895, <hdegoede@redhat.com>)
 - rc.sysinit: fix typo. (#487926)
 - console_init: loadkeys has a -q option for silent running. Use it.
-- ifup-tunnel: add compatiblity for openNHRP tunnels (#486559, <claude.tompers@ieee.lu>)
+- ifup-tunnel: add compatibility for openNHRP tunnels (#486559, <claude.tompers@ieee.lu>)
 - ccw_init: don't re-init an existing device, it causes errors. (#484411, <jpayne@redhat.com>)
 - netfs: use same kpartx arguments as rc.sysinit
 - don't list mtab in rwtab (#457941)
@@ -2691,7 +2633,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix typo in /etc/rc.d/init.d/network that broke linuxconf (#10472)
 
 * Mon Mar 27 2000 Bill Nottingham <notting@redhat.com>
-- remove compatiblity chkconfig links
+- remove compatibility chkconfig links
 - run 'netfs stop' on 'network stop' if necessary
 
 * Tue Mar 21 2000 Bernhard Rosenkraenzer <bero@redhat.com>
@@ -3162,7 +3104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Thu Nov 06 1997 Michael K. Johnson <johnsonm@redhat.com>
 - Fixed DEBUG option in ifup-ppp
-- Fixed PPP persistance
+- Fixed PPP persistence
 - Only change IP forwarding if necessary
 
 * Tue Oct 28 1997 Donnie Barnes <djb@redhat.com>