From 323b0fc34f98c5e666bdb8976eeaac795a14f07d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 8 Aug 2012 17:11:31 -0400
Subject: Drop prefdm.

---
 Makefile         |  3 ---
 initscripts.spec |  1 -
 prefdm           | 52 ----------------------------------------------------
 sysconfig.txt    | 11 -----------
 4 files changed, 67 deletions(-)
 delete mode 100755 prefdm

diff --git a/Makefile b/Makefile
index c209befa..e3be9e3e 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,6 @@ install:
 	if uname -m | grep -q s390 ; then \
 	  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
-
 	install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
 	install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
diff --git a/initscripts.spec b/initscripts.spec
index 2bca18d6..93d03506 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -161,7 +161,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/statetab.d
 /lib/systemd/fedora-*
 /lib/systemd/system/*
-%config /etc/X11/prefdm
 %config(noreplace) /etc/inittab
 %dir /etc/rc.d
 %dir /etc/rc.d/rc[0-9].d
diff --git a/prefdm b/prefdm
deleted file mode 100755
index 4ee44fc5..00000000
--- a/prefdm
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-# We need to source this so that the login screens get translated
-[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
-[ -f /etc/locale.conf ] && . /etc/locale.conf
-
-# Run preferred X display manager
-preferred=
-splash_quit_command=""
-if [ -f /etc/sysconfig/desktop ]; then
-	. /etc/sysconfig/desktop
-	if [ "$DISPLAYMANAGER" = GNOME ]; then
-		preferred=/usr/sbin/gdm
-	elif [ "$DISPLAYMANAGER" = KDE ]; then
-		preferred=/usr/bin/kdm
-	elif [ "$DISPLAYMANAGER" = WDM ]; then
-		preferred=/usr/bin/wdm
-		splash_quit_command="plymouth quit"
-	elif [ "$DISPLAYMANAGER" = XDM ]; then
-	        preferred=/usr/bin/xdm
-		splash_quit_command="plymouth quit"
-        elif [ -n "$DISPLAYMANAGER" ]; then
-		preferred=$DISPLAYMANAGER
-		splash_quit_command="plymouth quit"
-	fi
-fi
-
-# shut down boot splash
-$splash_quit_command
-
-shopt -s execfail
-
-[ -n "$preferred" ] && exec $preferred "$@" >/dev/null 2>&1 </dev/null
-
-# Fallbacks, in order
-exec gdm "$@" >/dev/null 2>&1 </dev/null
-exec kdm "$@" >/dev/null 2>&1 </dev/null
-
-for pkg in $(rpm -q --qf "%{NAME}\n" --whatprovides "service(graphical-login)"| LC_ALL=C sort -u) ; do
-	dm=$(rpm -q --provides $pkg | awk '/^service\(graphical-login\)/ { print $3 ; exit }')
-	if [ -n "$dm" ]; then
-		exec $dm "$@" >/dev/null 2>&1 </dev/null
-	else
-		exec $pkg "$@" >/dev/null 2>&1 </dev/null
-	fi
-done
-
-# catch all exit error
-plymouth quit
-exit 1
diff --git a/sysconfig.txt b/sysconfig.txt
index b8aff2bb..8163e437 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -82,17 +82,6 @@ Generic options:
     SRM=true on alpha only indicates the SRM 1900 epoch is in
       effect; otherwise the normal Unix epoch is assumed.
     
-/etc/sysconfig/desktop:
-  DESKTOP=GNOME|KDE
-     This determines the default desktop for new users.
-
-  Optional values from earlier releases: 
-  
-    DISPLAYMANAGER=GNOME|KDE|WDM|XDM
-      This determines display manager started by /etc/X11/prefdm,
-      independent of the desktop. This can be accomplished in current
-      releases merely by just installing the preferred display manager.
-
 /etc/sysconfig/init:
 
   ACTIVE_CONSOLES=<devices>
-- 
cgit v1.2.1