Merge commit 'initscripts-9.34-1' into mga-34

This brings our fully patched initscripts branch up to version 9.34.

Some code was not easily merged and thus not all functionality relating
to multiple IP addresses per interface were merged in.

Conflicts:
	Makefile
	lang.csh
	lang.sh
	prefdm
	rc.d/init.d/functions
	rc.d/init.d/netfs
	rc.d/init.d/network
	rc.d/rc
	rc.d/rc.local
	rc.d/rc.sysinit
	service
	sysconfig.txt
	sysconfig/network-scripts/ifdown-eth
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/ifup-ipv6
	sysconfig/network-scripts/ifup-sit
	sysconfig/network-scripts/ifup-tunnel
	sysconfig/network-scripts/network-functions
	systemd/system/fedora-sysinit-unhack.service

1 files changed, 11 insertions, 11 deletions

diff --git a/prefdm b/prefdm
index 71a9c530..44897e51 100755
--- a/prefdm
+++ b/prefdm
@@ -41,27 +41,25 @@ if [ -f /etc/sysconfig/desktop ]; then
 	[ -z "$DISPLAYMANAGER" ] && DISPLAYMANAGER=$DESKTOP
 	if [ "$DISPLAYMANAGER" = "GDM" -o "$DISPLAYMANAGER" = "gdm" -o "$DISPLAYMANAGER" = "GNOME" -o "$DISPLAYMANAGER" = "gnome" -o "$DISPLAYMANAGER" = "Gnome" ]; then
 	    dm=GNOME
-	    # only new gdm will shutdown plymouth itself
-	    [ ! -d "/var/run/gdm" ] || no_plymouth_quit="yes"
-	elif [ "$DISPLAYMANAGER" = "KDE" -o "$DISPLAYMANAGER" = "kde" ]; then
-	    dm=KDE
-#	    no_plymouth_quit="yes"
-	elif [ "$DISPLAYMANAGER" = "KDM" -o "$DISPLAYMANAGER" = "kdm" ]; then
+	elif [ "$DISPLAYMANAGER" = "KDM" -o "$DISPLAYMANAGER" = "kdm" -o "$DISPLAYMANAGER" = "KDE" -o "$DISPLAYMANAGER" = "kde" ]; then
 	    dm=KDM
-#	    no_plymouth_quit="yes"
 	elif [ "$DISPLAYMANAGER" = "WDM" -o "$DISPLAYMANAGER" = "wdm" ] ; then
 	    dm=WDM
+	    plymouth_quit=yes
 	elif [ "$DISPLAYMANAGER" = "XDM" -o "$DISPLAYMANAGER" = "xdm" ] ; then
 	    dm=XDM
+	    plymouth_quit=yes
 	elif [ "$DISPLAYMANAGER" = "SLiM" -o "$DISPLAYMANAGER" = "slim" ] ; then
 	    dm=SLiM
-        elif [ -n "$DISPLAYMANAGER" ]; then
+	    plymouth_quit=yes
+	elif [ -n "$DISPLAYMANAGER" ]; then
 	    dm=$DISPLAYMANAGER
+	    plymouth_quit=yes
         fi
 fi
 
-# shut down boot splash
-[ -x /bin/plymouth ] && [ "x$no_plymouth_quit" != "xyes" ] && /bin/plymouth quit
+# shut down boot splash if needed (gdm/kdm do it his internally)
+[ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit
 
 # xdm-like program are launched from the console, however, the locale-setting
 # can be done in a way that console is not localize, while X11 is.
@@ -79,4 +77,6 @@ if [ -n "$preferred" ]; then
 	echo -n $! > /var/run/dm.pid
 fi
 
-exit 0
+# catch all exit error
+plymouth quit
+exit 1