saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index fc535f861014f18dc3f5f29270e4756cae16840f..d9f69ea79f8d1bae2bee04ec1a5a6ccf8c42ce79 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -250,6 +250,7 @@ maybe chmod 0644 './conf.d/iptables'
 maybe chmod 0644 './conf.d/keymaps'
 maybe chmod 0644 './conf.d/killprocs'
 maybe chmod 0644 './conf.d/libvirtd'
+maybe chmod 0644 './conf.d/lm_sensors'
 maybe chmod 0644 './conf.d/localmount'
 maybe chmod 0644 './conf.d/lvm'
 maybe chmod 0644 './conf.d/mdadm'

diff --git a/conf.d/lm_sensors b/conf.d/lm_sensors
new file mode 100644 (file)
index 0000000..3f015d1
--- /dev/null
+++ b/conf.d/lm_sensors
@@ -0,0 +1,25 @@
+# Generated by sensors-detect on Thu May 10 15:20:56 2012
+# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
+# be loaded/unloaded.
+#
+# The format of this file is a shell script that simply defines variables:
+# HWMON_MODULES for hardware monitoring driver modules, and optionally
+# BUS_MODULES for any required bus driver module (for example for I2C or SPI).
+
+# Load modules at startup
+LOADMODULES=yes
+
+# Initialize sensors at startup
+INITSENSORS=yes
+
+HWMON_MODULES="it87"
+
+# For compatibility reasons, modules are also listed individually as variables
+#    MODULE_0, MODULE_1, MODULE_2, etc.
+# Please note that the numbers in MODULE_X must start at 0 and increase in
+# steps of 1. Any number that is missing will make the init script skip the
+# rest of the modules. Use MODULE_X_ARGS for arguments.
+#
+# You should use BUS_MODULES and HWMON_MODULES instead if possible.
+
+MODULE_0=it87

diff --git a/runlevels/default/lm_sensors b/runlevels/default/lm_sensors
new file mode 120000 (symlink)
index 0000000..4644325
--- /dev/null
+++ b/runlevels/default/lm_sensors
@@ -0,0 +1 @@
+/etc/init.d/lm_sensors
\ No newline at end of file

diff --git a/ssh/ssh_config b/ssh/ssh_config
index 5a03365ed5d689020ca0bb3108864626bbc7cf4d..7fa64c1881493fca43aaf71d9efc8160386ad03a 100644 (file)
--- a/ssh/ssh_config
+++ b/ssh/ssh_config
@@ -22,6 +22,7 @@
 ForwardAgent yes
 #   ForwardX11 no
 ForwardX11 yes
+ServerAliveInterval 30
 #   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes