saving uncommitted changes in /etc prior to emerge run

diff --git a/init.d/xdm b/init.d/xdm
index c152e40e192df4d83cfd948f96c8ba513c3d43a9..539cac107c3bc42376ee73ce62e77f3a7dcb2d91 100755 (executable)
--- a/init.d/xdm
+++ b/init.d/xdm
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-5,v 1.1 2011/11/24 13:09:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -46,9 +46,10 @@ depend() {
        # (#70689 comment #92) Start after consolefont to avoid display corruption
        # (#291269) Start after quota, since some dm need readable home
        # (#390609) gdm-3 will fail when dbus is not running
+       # (#366753) starting keymaps after X causes problems
        after bootmisc consolefont modules netmount
        after readahead-list ypbind autofs openvpn gpm lircmd
-       after quota
+       after quota keymaps
        before alsasound
 
        # Start before X
@@ -67,11 +68,7 @@ setup_dm() {
        NAME=
        case "${MY_XDM}" in
                kdm|kde)
-                       EXE="$(which kdm)"
-                       PIDFILE=/var/run/kdm.pid
-                       ;;
-               kdm-*)
-                       EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+                       EXE=/usr/bin/kdm
                        PIDFILE=/var/run/kdm.pid
                        ;;
                entrance*)
@@ -103,7 +100,7 @@ setup_dm() {
                        ;;
                *)
                        # first find out if there is such executable
-                       EXE="$(which ${MY_XDM} 2>/dev/null)"
+                       EXE="$(command -v ${MY_XDM} 2>/dev/null)"
                        PIDFILE="/var/run/${MY_XDM}.pid"
 
                        # warn user that he is doing sick things if the exe was not found