From 2469e4e95515772d162806ed3f53a64c042eeb68 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Thu, 11 Sep 2014 14:27:05 +0100
Subject: [PATCH 101/103] Kill off the 'dm' initscript.

This is no longer called as it is masked by a prefdm systemd
unit but even that will die soon enough.
---
 mandriva/Makefile |  1 -
 mandriva/dm       | 74 -------------------------------------------------------
 2 files changed, 75 deletions(-)
 delete mode 100755 mandriva/dm

diff --git a/mandriva/Makefile b/mandriva/Makefile
index b975a4b..d0fe2a5 100644
--- a/mandriva/Makefile
+++ b/mandriva/Makefile
@@ -57,7 +57,6 @@ install: all check
 	install -D -m644 autofsck $(ROOT)/etc/sysconfig/autofsck
 	@for i in $(SUBDIRS);do	make -C $$i install;done
 
-	install -m755 dm $(ROOT)/etc/rc.d/init.d/
 	install -m755 hibernate-cleanup.sh $(ROOT)/usr/sbin/
 	install -m755 lsb-init-functions $(ROOT)/usr/lib/lsb/init-functions
 	install -m755 mdv-network-event $(ROOT)/usr/sbin/
diff --git a/mandriva/dm b/mandriva/dm
deleted file mode 100755
index 99306c6..0000000
--- a/mandriva/dm
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#---------------------------------------------------------------
-# Project         : Mageia
-# Module          : initscripts
-# File            : dm
-# Version         : $Id$
-# Author          : Frederic Lepied
-# Created On      : Wed May 29 22:10:40 2002
-#---------------------------------------------------------------
-# chkconfig: 57 30 09
-# description: This startup script launches the graphical display manager.
-#---------------------------------------------------------------
-#
-### BEGIN INIT INFO
-# Provides: dm
-# Should-Start: network-auth acpid lircmd xfs haldaemon
-# Default-Start: 5 7
-# Short-Description: Launches the graphical display manager
-# Description: This startup script launches the graphical display manager.
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-ret=0
-
-case $1 in 
-    start)
-	gprintf "Starting display manager: "
-	/etc/X11/prefdm -nodaemon &
-	success "Display manager startup"
-	ret=$?
-	echo
-	if [ $ret = 0 ]; then
-	    touch /var/lock/subsys/dm
-	fi
-	;;
-
-    stop)
-	gprintf "Stopping display manager: "
-	killproc dm
-	ret=$?
-	if [ $ret = 0 ]; then
-	    success "Display manager shutdown"
-	    rm -f /var/lock/subsys/dm
-	else
-	    failure "Display manager shutdown"
-	fi
-	echo
-	;;
-
-    status)
-	status dm
-	;;
-
-    reload)
-	;;
-
-    restart)
-	$0 stop
-	# give a chance to the X server to stop gracefully
-	sleep 5
-	$0 start
-	ret=$?
-	;;
-    *)
-	gprintf "Usage: %s\n" "$(basename $0) {start|stop|restart|status}"
-	exit 0
-	;;
-esac
-
-exit $ret
-
-# dm ends here
-- 
2.1.0