saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 3f3a7e58fcd6329d4a50493430e51411206bcfac..dc1bafddab6b2e6099f67ab8b3488a451a9812cf 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -94,6 +94,7 @@ maybe chmod 0755 './X11/dm/Sessions'
 maybe chmod 0755 './X11/dm/Sessions/custom.desktop'
 maybe chmod 0644 './X11/dm/Sessions/wmaker.desktop'
 maybe chmod 0755 './X11/gdm'
+maybe chmod 0644 './X11/gdm/._cfg0000_custom.conf'
 maybe chmod 0755 './X11/gdm/Init'
 maybe chmod 0755 './X11/gdm/Init/Default'
 maybe chmod 0755 './X11/gdm/PostLogin'

diff --git a/X11/gdm/._cfg0000_custom.conf b/X11/gdm/._cfg0000_custom.conf
new file mode 100644 (file)
index 0000000..559823b
--- /dev/null
+++ b/X11/gdm/._cfg0000_custom.conf
@@ -0,0 +1,80 @@
+# GDM Custom Configuration file.
+#
+# This file is the appropriate place for specifying your customizations to the
+# GDM configuration.   If you run gdmsetup, it will automatically edit this
+# file for you and will cause the daemon and any running GDM GUI programs to
+# automatically update with the new configuration.  Not all configuration
+# options are supported by gdmsetup, so to modify some values it may be
+# necessary to modify this file directly by hand.
+#
+# This file overrides the default configuration settings.  These settings 
+# are stored in the GDM System Defaults configuration file, which is found
+# at the following location.
+#
+# /usr/share/gdm/defaults.conf.  
+#
+# This file contains comments about the meaning of each configuration option,
+# so is also a useful reference.  Also refer to the documentation links at
+# the end of this comment for further information.  In short, to hand-edit
+# this file, simply add or modify the key=value combination in the
+# appropriate section in the template below this comment section.
+#
+# For example, if you want to specify a different value for the Enable key
+# in the "[debug]" section of your GDM System Defaults configuration file,
+# then add "Enable=true" in the "[debug]" section of this file.  If the
+# key already exists in this file, then simply modify it.
+#
+# Older versions of GDM used the "gdm.conf" file for configuration.  If your
+# system has an old gdm.conf file on the system, it will be used instead of
+# this file - so changes made to this file will not take effect.  Consider
+# migrating your configuration to this file and removing the gdm.conf file.
+#
+# If you hand edit a GDM configuration file, you can run the following
+# command and the GDM daemon will immediately reflect the change.  Any
+# running GDM GUI programs will also be notified to update with the new
+# configuration.
+#
+# gdmflexiserver --command="UPDATE_CONFIG <configuration key>"
+#
+# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
+#
+# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and
+# re-read the new configuration settings.  You can also restart GDM by sending
+# a HUP or USR1 signal to the daemon.  HUP behaves like gdm-restart and causes
+# any user session started by GDM to exit immediately while USR1 behaves like
+# gdm-safe-restart and will wait until all users log out before restarting GDM.
+#
+# For full reference documentation see the gnome help browser under
+# GNOME|System category.  You can also find the docs in HTML form on
+# http://www.gnome.org/projects/gdm/
+#
+# NOTE: Lines that begin with "#" are considered comments.
+#
+# Have fun!
+
+[daemon]
+
+[security]
+
+[xdmcp]
+
+[gui]
+
+[greeter]
+
+[chooser]
+
+[debug]
+
+# Note that to disable servers defined in the GDM System Defaults
+# configuration file (such as 0=Standard, you must put a line in this file
+# that says 0=inactive, as described in the Configuration section of the GDM
+# documentation.
+#
+[servers]
+
+# Also note, that if you redefine a [server-foo] section, then GDM will
+# use the definition in this file, not the GDM System Defaults configuration
+# file.  It is currently not possible to disable a [server-foo] section
+# defined in the GDM System Defaults configuration file.
+#

diff --git a/X11/gdm/Init/Default b/X11/gdm/Init/Default
index 01cd6e96c7f33f3c21e586aa9d9282989b80886c..de036f4ad270dd08f57b6b1d0305b31ec8288d45 100755 (executable)
--- a/X11/gdm/Init/Default
+++ b/X11/gdm/Init/Default
@@ -3,7 +3,7 @@
 # Plus a lot of fun stuff added
 #  -George
 
-PATH=/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH
+PATH=/usr/bin:$PATH
 OLD_IFS=$IFS
 
 gdmwhich () {

diff --git a/X11/gdm/PostSession/Default b/X11/gdm/PostSession/Default
index 6b2c50eca15c27cc24227c6fefc96a1c2464c2eb..fa7531673194ee7490a10f6517e1f583ac69aa85 100755 (executable)
--- a/X11/gdm/PostSession/Default
+++ b/X11/gdm/PostSession/Default
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH:/bin:/usr/bin"
+PATH="/usr/bin:$PATH:/bin:/usr/bin"
 OLD_IFS=$IFS
 
 gdmwhich () {

diff --git a/X11/gdm/PreSession/Default b/X11/gdm/PreSession/Default
index 5905608c4e7a4c6e6a2b1e7ff9cacefb18059760..dc523c6e32fccdc688ea824ca555965b7f8e570c 100755 (executable)
--- a/X11/gdm/PreSession/Default
+++ b/X11/gdm/PreSession/Default
@@ -2,7 +2,7 @@
 #
 # Note that output goes into the .xsession-errors file for easy debugging
 #
-PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin:$PATH:/bin:/usr/bin"
+PATH="/usr/bin:$PATH:/bin:/usr/bin"
 OLD_IFS=$IFS
 
 gdmwhich () {