committing changes in /etc after emerge run

Package changes:
+x11-base/xorg-server-1.11.2-r2

diff --git a/.etckeeper b/.etckeeper
index 0b2d8ddc96b1735fddfd252790c239a25d968227..3e6dd8df38a919ef7f86e51b029f7277dfe0cf6f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -224,6 +224,7 @@ maybe chmod 0644 './conf.d/twistd'
 maybe chmod 0644 './conf.d/udev'
 maybe chmod 0644 './conf.d/urandom'
 maybe chmod 0644 './conf.d/wpa_supplicant'
+maybe chmod 0644 './conf.d/xdm'
 maybe chmod 0644 './conf.d/xinetd'
 maybe chmod 0700 './config-archive'
 maybe chmod 0755 './config-archive/etc'
@@ -739,6 +740,8 @@ maybe chmod 0755 './init.d/ulogd'
 maybe chmod 0755 './init.d/urandom'
 maybe chmod 0755 './init.d/vixie-cron'
 maybe chmod 0755 './init.d/wpa_supplicant'
+maybe chmod 0755 './init.d/xdm'
+maybe chmod 0755 './init.d/xdm-setup'
 maybe chmod 0755 './init.d/xinetd'
 maybe chmod 0644 './inittab'
 maybe chmod 0644 './inputrc'

diff --git a/conf.d/xdm b/conf.d/xdm
new file mode 100644 (file)
index 0000000..c82fece
--- /dev/null
+++ b/conf.d/xdm
@@ -0,0 +1,10 @@
+# We always try and start X on a static VT. The various DMs normally default
+# to using VT7. If you wish to use the xdm init script, then you should ensure
+# that the VT checked is the same VT your DM wants to use. We do this check to
+# ensure that you haven't accidentally configured something to run on the VT
+# in your /etc/inittab file so that you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ?  [ xdm | gdm | kdm | gpe | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+DISPLAYMANAGER="xdm"

diff --git a/init.d/xdm b/init.d/xdm
new file mode 100755 (executable)
index 0000000..c152e40
--- /dev/null
+++ b/init.d/xdm
@@ -0,0 +1,219 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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 $
+
+# This is here to serve as a note to myself, and future developers.
+#
+# Any Display manager (gdm,kdm,xdm) has the following problem:  if
+# it is started before any getty, and no vt is specified, it will
+# usually run on vt2.  When the getty on vt2 then starts, and the
+# DM is already started, the getty will take control of the keyboard,
+# leaving us with a "dead" keyboard.
+#
+# Resolution: add the following line to /etc/inittab
+#
+#  x:a:once:/etc/X11/startDM.sh
+#
+# and have /etc/X11/startDM.sh start the DM in daemon mode if
+# a lock is present (with the info of what DM should be started),
+# else just fall through.
+#
+# How this basically works, is the "a" runlevel is a additional
+# runlevel that you can use to fork processes with init, but the
+# runlevel never gets changed to this runlevel.  Along with the "a"
+# runlevel, the "once" key word means that startDM.sh will only be
+# run when we specify it to run, thus eliminating respawning
+# startDM.sh when "xdm" is not added to the default runlevel, as was
+# done previously.
+#
+# This script then just calls "telinit a", and init will run
+# /etc/X11/startDM.sh after the current runlevel completes (this
+# script should only be added to the actual runlevel the user is
+# using).
+#
+# Martin Schlemmer
+# aka Azarah
+# 04 March 2002
+
+depend() {
+       need localmount xdm-setup
+
+       # this should start as early as possible
+       # we can't do 'before *' as that breaks it
+       # (#139824) Start after ypbind and autofs for network authentication
+       # (#145219 #180163) Could use lirc mouse as input device
+       # (#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
+       after bootmisc consolefont modules netmount
+       after readahead-list ypbind autofs openvpn gpm lircmd
+       after quota
+       before alsasound
+
+       # Start before X
+       use consolekit dbus xfs
+}
+
+setup_dm() {
+       local MY_XDM
+       
+       MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
+
+       # Load our root path from profile.env
+       # Needed for kdm
+       PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
+
+       NAME=
+       case "${MY_XDM}" in
+               kdm|kde)
+                       EXE="$(which kdm)"
+                       PIDFILE=/var/run/kdm.pid
+                       ;;
+               kdm-*)
+                       EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+                       PIDFILE=/var/run/kdm.pid
+                       ;;
+               entrance*)
+                       EXE=/usr/sbin/entranced
+                       PIDFILE=/var/lib/entranced.pid
+                       ;;
+               gdm|gnome)
+                       EXE=/usr/bin/gdm
+                       [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
+                       PIDFILE=/var/run/gdm.pid
+                       ;;
+               wdm)
+                       EXE=/usr/bin/wdm
+                       PIDFILE=
+                       ;;
+               gpe)
+                       EXE=/usr/bin/gpe-dm
+                       PIDFILE=/var/run/gpe-dm.pid
+                       ;;
+               lxdm)
+                       EXE=/usr/sbin/lxdm-binary
+                       PIDFILE=/var/run/lxdm.pid
+                       START_STOP_ARGS="--background"
+                       ;;
+               lightdm)
+                       EXE=/usr/sbin/lightdm
+                       PIDFILE=/var/run/lightdm.pid
+                       START_STOP_ARGS="--background"
+                       ;;
+               *)
+                       # first find out if there is such executable
+                       EXE="$(which ${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
+                       if [ -z "${EXE}" ]; then
+                               echo "ERROR: Your XDM value is invalid."
+                               echo "  No ${MY_XDM} executable could be found on your system."
+                       fi
+                       ;;
+       esac
+
+       if ! [ -x "${EXE}" ]; then
+               EXE=/usr/bin/xdm
+               PIDFILE=/var/run/xdm.pid
+               if ! [ -x "/usr/bin/xdm" ]; then
+                       echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
+                       echo "  or install x11-apps/xdm package"
+                       eend 255
+               fi
+       fi
+}
+
+# Check to see if something is defined on our VT
+vtstatic() {
+       if [ -e /etc/inittab ] ; then
+               grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
+       elif [ -e /etc/ttys ] ; then
+               grep -q "^ttyv$(($1 - 1))" /etc/ttys
+       else
+               return 1
+       fi
+}
+
+start() {
+       local EXE NAME PIDFILE
+       setup_dm
+
+       if [ -f /etc/.noxdm ]; then
+               einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
+               rm /etc/.noxdm
+               return 0
+       fi
+
+       ebegin "Setting up ${EXE##*/}"
+
+       # save the prefered DM
+       save_options "service" "${EXE}"
+       save_options "name"    "${NAME}"
+       save_options "pidfile" "${PIDFILE}"
+       save_options "start_stop_args" "${START_STOP_ARGS}"
+
+       if [ -n "${CHECKVT-y}" ] ; then
+               if vtstatic "${CHECKVT:-7}" ; then
+                       if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
+                               ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
+                               telinit a >/dev/null 2>&1
+                               return 0
+                       else
+                               eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
+                               return 1
+                       fi
+               fi
+       fi
+
+       /etc/X11/startDM.sh
+       eend 0
+}
+
+stop() {
+       local curvt retval
+
+       retval=0
+       if [ -t 0 ]; then
+               if type fgconsole >/dev/null 2>&1; then
+                       curvt=$(fgconsole 2>/dev/null)
+               else
+                       curvt=$(tty)
+                       case "${curvt}" in
+                               /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
+                               *) curvt= ;;
+                       esac
+               fi
+       fi
+       local myexe myname mypidfile myservice
+       myexe=$(get_options "service")
+       myname=$(get_options "name")
+       mypidfile=$(get_options "pidfile")
+       myservice=${myexe##*/}
+
+       [ -z "${myexe}" ] && return 0
+
+       ebegin "Stopping ${myservice}"
+
+       if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
+               start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
+                       ${mypidfile:+--pidfile} ${mypidfile} \
+                       ${myname:+--name} ${myname}
+               retval=${?}
+       fi
+
+       # switch back to original vt
+       if [ -n "${curvt}" ]; then
+               if type chvt >/dev/null 2>&1; then
+                       chvt "${curvt}"
+               else
+                       vidcontrol -s "$((curvt + 1))"
+               fi
+       fi
+
+       eend ${retval} "Error stopping ${myservice}"
+       return ${retval}
+}
+
+# vim: set ts=4 :

diff --git a/init.d/xdm-setup b/init.d/xdm-setup
new file mode 100755 (executable)
index 0000000..365664e
--- /dev/null
+++ b/init.d/xdm-setup
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
+
+depend() {
+       need localmount
+}
+
+start() {
+       if get_bootparam "nox" ; then
+               touch /etc/.noxdm
+       fi
+}