Current state

diff --git a/.gitignore b/.gitignore
index 11ea0a5ce7863d8a79a3709f180ec5157b2f9f4e..9384b300674ac3c6d0eae2df4180b7152994ed2b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,5 +49,7 @@ DEADJOE
 *.bak
 
 # end section managed by etckeeper
-
+/motd
+/mtab
 cups/*.conf.O
+._cfg*

diff --git a/config-archive/etc/etckeeper/etckeeper.conf b/config-archive/etc/etckeeper/etckeeper.conf
index d346d21d64d2079cf8a123a59c698d543b94c188..a5983d9a7af9820e70f8a2294b8ccbb477c6b6cd 100644 (file)
--- a/config-archive/etc/etckeeper/etckeeper.conf
+++ b/config-archive/etc/etckeeper/etckeeper.conf
@@ -30,13 +30,15 @@ DARCS_COMMIT_OPTIONS="-a"
 #AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, yum etc)
+# (apt, pacman-g2, yum, zypper etc)
 # For gentoo this is emerge
-#HIGHLEVEL_PACKAGE_MANAGER=apt
 HIGHLEVEL_PACKAGE_MANAGER=emerge
 
 # The low-level package manager that's being used.
-# (dpkg, rpm, pacman-g2, etc)
-# For gentoo this is equery
-#LOWLEVEL_PACKAGE_MANAGER=dpkg
-LOWLEVEL_PACKAGE_MANAGER=equery
+# (dpkg, rpm, pacman, pacman-g2, etc)
+# For gentoo this is qlist
+LOWLEVEL_PACKAGE_MANAGER=qlist
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git).
+PUSH_REMOTE="origin"

diff --git a/config-archive/etc/etckeeper/etckeeper.conf.dist.new b/config-archive/etc/etckeeper/etckeeper.conf.dist.new
index 24c180ce85e1550504787f09f9c9cd56458d6e59..c1da4bf7ffbaa079cefd6e8aaf9797e7b4e21463 100644 (file)
--- a/config-archive/etc/etckeeper/etckeeper.conf.dist.new
+++ b/config-archive/etc/etckeeper/etckeeper.conf.dist.new
@@ -30,13 +30,15 @@ DARCS_COMMIT_OPTIONS="-a"
 #AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, yum etc)
+# (apt, pacman-g2, yum, zypper etc)
 # For gentoo this is emerge
-#HIGHLEVEL_PACKAGE_MANAGER=apt
 HIGHLEVEL_PACKAGE_MANAGER=emerge
 
 # The low-level package manager that's being used.
-# (dpkg, rpm, pacman-g2, etc)
-# For gentoo this is portage
-#LOWLEVEL_PACKAGE_MANAGER=dpkg
-LOWLEVEL_PACKAGE_MANAGER=portage
+# (dpkg, rpm, pacman, pacman-g2, etc)
+# For gentoo this is qlist
+LOWLEVEL_PACKAGE_MANAGER=qlist
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git).
+PUSH_REMOTE=""

diff --git a/etckeeper/._cfg0000_etckeeper.conf b/etckeeper/._cfg0000_etckeeper.conf
deleted file mode 100644 (file)
index c1da4bf..0000000
--- a/etckeeper/._cfg0000_etckeeper.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# The VCS to use.
-#VCS="hg"
-VCS="git"
-#VCS="bzr"
-#VCS="darcs"
-
-# Options passed to git commit when run by etckeeper.
-GIT_COMMIT_OPTIONS=""
-
-# Options passed to hg commit when run by etckeeper.
-HG_COMMIT_OPTIONS=""
-
-# Options passed to bzr commit when run by etckeeper.
-BZR_COMMIT_OPTIONS=""
-
-# Options passed to darcs record when run by etckeeper.
-DARCS_COMMIT_OPTIONS="-a"
-
-# Uncomment to avoid etckeeper committing existing changes
-# to /etc automatically once per day.
-#AVOID_DAILY_AUTOCOMMITS=1
-
-# Uncomment the following to avoid special file warning
-# (the option is enabled automatically by cronjob regardless).
-#AVOID_SPECIAL_FILE_WARNING=1
-
-# Uncomment to avoid etckeeper committing existing changes to 
-# /etc before installation. It will cancel the installation,
-# so you can commit the changes by hand.
-#AVOID_COMMIT_BEFORE_INSTALL=1
-
-# The high-level package manager that's being used.
-# (apt, pacman-g2, yum, zypper etc)
-# For gentoo this is emerge
-HIGHLEVEL_PACKAGE_MANAGER=emerge
-
-# The low-level package manager that's being used.
-# (dpkg, rpm, pacman, pacman-g2, etc)
-# For gentoo this is qlist
-LOWLEVEL_PACKAGE_MANAGER=qlist
-
-# To push each commit to a remote, put the name of the remote here.
-# (eg, "origin" for git).
-PUSH_REMOTE=""