From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Fri, 9 Oct 2015 08:45:19 +0000 (+0200)
Subject: Current state
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7f47e422dc59c3b533b9c47f2f1db915d6808e6b;p=config%2Fweimar%2Fetc.git

Current state
---

diff --git a/.etckeeper b/.etckeeper
index 6e52a1e..c6f05cd 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -683,7 +683,6 @@ maybe chmod 0644 'mlocate-cron.conf'
 maybe chmod 0755 'modprobe.d'
 maybe chmod 0644 'modprobe.d/aliases.conf'
 maybe chmod 0644 'modprobe.d/i386.conf'
-maybe chmod 0644 'motd'
 maybe chmod 0644 'motd.tail'
 maybe chmod 0755 'mysql'
 maybe chmod 0644 'mysql/my.cnf'
diff --git a/.gitignore b/.gitignore
index 0986781..615f3e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ fake-hwclock.data
 DEADJOE
 
 # end section managed by etckeeper
+
+motd
diff --git a/cron.daily/etckeeper b/cron.daily/etckeeper
new file mode 100755
index 0000000..5255691
--- /dev/null
+++ b/cron.daily/etckeeper
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+	. /etc/etckeeper/etckeeper.conf
+	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
+		# avoid autocommit if an install run is in progress
+		lockfile=/var/cache/etckeeper/packagelist.pre-install
+		if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
+			rm -f "$lockfile" # stale
+		fi
+		if [ ! -e "$lockfile" ]; then
+			AVOID_SPECIAL_FILE_WARNING=1
+			export AVOID_SPECIAL_FILE_WARNING
+			if etckeeper unclean; then
+				etckeeper commit "daily autocommit" >/dev/null
+			fi
+		fi
+	fi
+fi
diff --git a/motd b/motd
deleted file mode 100644
index 9c75c83..0000000
--- a/motd
+++ /dev/null
@@ -1,14 +0,0 @@
-Linux weimar 4.0.5-gentoo #1 SMP Tue Jun 30 20:13:36 CEST 2015 x86_64 Intel(R) Core(TM) i7-3770 CPU @ 3.40GHz GenuineIntel GNU/Linux
-Gentoo Base System release 2.2
-__        __   _                      
-\ \      / /__(_)_ __ ___   __ _ _ __ 
- \ \ /\ / / _ \ | '_ ` _ \ / _` | '__|
-  \ V  V /  __/ | | | | | | (_| | |   
-   \_/\_/ \___|_|_| |_| |_|\__,_|_|   
-                                      
-
-Es liegt in der menschlichen Natur, vernünftig zu denken und unlogisch
-zu handeln.
-
-Today is Boomtime, the 63rd day of Bureaucracy in the YOLD 3181
-