From: fbrehm Date: Wed, 18 Jul 2012 08:08:26 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=df79c76c2befc60b13be86692e58457fc6a89c2f;p=config%2Fsamara%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index dc1bafd..55f5e48 100755 --- a/.etckeeper +++ b/.etckeeper @@ -94,7 +94,6 @@ 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' @@ -300,6 +299,10 @@ maybe chmod 0644 './config-archive/etc/ImageMagick/type-ghostscript.xml.dist' maybe chmod 0755 './config-archive/etc/UPower' maybe chmod 0644 './config-archive/etc/UPower/UPower.conf' maybe chmod 0644 './config-archive/etc/UPower/UPower.conf.dist' +maybe chmod 0755 './config-archive/etc/X11' +maybe chmod 0755 './config-archive/etc/X11/gdm' +maybe chmod 0644 './config-archive/etc/X11/gdm/custom.conf' +maybe chmod 0644 './config-archive/etc/X11/gdm/custom.conf.dist.new' maybe chmod 0755 './config-archive/etc/abcde' maybe chmod 0644 './config-archive/etc/abcde/abcde.conf' maybe chmod 0644 './config-archive/etc/abcde/abcde.conf.dist' diff --git a/X11/gdm/._cfg0000_custom.conf b/X11/gdm/._cfg0000_custom.conf deleted file mode 100644 index 559823b..0000000 --- a/X11/gdm/._cfg0000_custom.conf +++ /dev/null @@ -1,80 +0,0 @@ -# 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 " -# -# 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/config-archive/etc/X11/gdm/custom.conf b/config-archive/etc/X11/gdm/custom.conf new file mode 100644 index 0000000..f7dc8cc --- /dev/null +++ b/config-archive/etc/X11/gdm/custom.conf @@ -0,0 +1,91 @@ +# 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 " +# +# 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] + + + +Browser=true + + + + +SoundOnLoginFile=/usr/share/sounds/startup3.wav + +GraphicalTheme=gentoo-cow + +[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/config-archive/etc/X11/gdm/custom.conf.dist.new b/config-archive/etc/X11/gdm/custom.conf.dist.new new file mode 100644 index 0000000..559823b --- /dev/null +++ b/config-archive/etc/X11/gdm/custom.conf.dist.new @@ -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 " +# +# 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. +#