saving uncommitted changes in /etc prior to emerge run

diff --git a/config-archive/etc/etckeeper/etckeeper.conf.dist b/config-archive/etc/etckeeper/etckeeper.conf.dist
new file mode 100644 (file)
index 0000000..0a9c88b
--- /dev/null
+++ b/config-archive/etc/etckeeper/etckeeper.conf.dist
@@ -0,0 +1,53 @@
+# 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, dnf, zypper etc)
+#HIGHLEVEL_PACKAGE_MANAGER=apt
+
+# Gentoo specific:
+# For portage this is emerge
+# For paludis this is cave
+HIGHLEVEL_PACKAGE_MANAGER=emerge
+
+# The low-level package manager that's being used.
+# (dpkg, rpm, pacman, pacman-g2, etc)
+#LOWLEVEL_PACKAGE_MANAGER=dpkg
+
+# Gentoo specific:
+# For portage this is qlist
+# For paludis this is cave
+LOWLEVEL_PACKAGE_MANAGER=qlist
+
+# To push each commit to a remote, put the name of the remote here.
+# (eg, "origin" for git). Space-separated lists of multiple remotes
+# also work (eg, "origin gitlab github" for git).
+PUSH_REMOTE=""

diff --git a/config-archive/etc/etckeeper/etckeeper.conf.dist.new b/config-archive/etc/etckeeper/etckeeper.conf.dist.new
deleted file mode 100644 (file)
index 0a9c88b..0000000
--- a/config-archive/etc/etckeeper/etckeeper.conf.dist.new
+++ /dev/null
@@ -1,53 +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, dnf, zypper etc)
-#HIGHLEVEL_PACKAGE_MANAGER=apt
-
-# Gentoo specific:
-# For portage this is emerge
-# For paludis this is cave
-HIGHLEVEL_PACKAGE_MANAGER=emerge
-
-# The low-level package manager that's being used.
-# (dpkg, rpm, pacman, pacman-g2, etc)
-#LOWLEVEL_PACKAGE_MANAGER=dpkg
-
-# Gentoo specific:
-# For portage this is qlist
-# For paludis this is cave
-LOWLEVEL_PACKAGE_MANAGER=qlist
-
-# To push each commit to a remote, put the name of the remote here.
-# (eg, "origin" for git). Space-separated lists of multiple remotes
-# also work (eg, "origin gitlab github" for git).
-PUSH_REMOTE=""

diff --git a/etckeeper/._cfg0000_etckeeper.conf b/etckeeper/._cfg0000_etckeeper.conf
deleted file mode 100644 (file)
index 0a9c88b..0000000
--- a/etckeeper/._cfg0000_etckeeper.conf
+++ /dev/null
@@ -1,53 +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, dnf, zypper etc)
-#HIGHLEVEL_PACKAGE_MANAGER=apt
-
-# Gentoo specific:
-# For portage this is emerge
-# For paludis this is cave
-HIGHLEVEL_PACKAGE_MANAGER=emerge
-
-# The low-level package manager that's being used.
-# (dpkg, rpm, pacman, pacman-g2, etc)
-#LOWLEVEL_PACKAGE_MANAGER=dpkg
-
-# Gentoo specific:
-# For portage this is qlist
-# For paludis this is cave
-LOWLEVEL_PACKAGE_MANAGER=qlist
-
-# To push each commit to a remote, put the name of the remote here.
-# (eg, "origin" for git). Space-separated lists of multiple remotes
-# also work (eg, "origin gitlab github" for git).
-PUSH_REMOTE=""

diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf
index a5983d9a7af9820e70f8a2294b8ccbb477c6b6cd..8134bfbc80b4b26fa4113c67514df21490c703cc 100644 (file)
--- a/etckeeper/etckeeper.conf
+++ b/etckeeper/etckeeper.conf
@@ -30,15 +30,24 @@ DARCS_COMMIT_OPTIONS="-a"
 #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
+# (apt, pacman-g2, yum, dnf, zypper etc)
+#HIGHLEVEL_PACKAGE_MANAGER=apt
+
+# Gentoo specific:
+# For portage this is emerge
+# For paludis this is cave
 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=dpkg
+
+# Gentoo specific:
+# For portage this is qlist
+# For paludis this is cave
 LOWLEVEL_PACKAGE_MANAGER=qlist
 
 # To push each commit to a remote, put the name of the remote here.
-# (eg, "origin" for git).
+# (eg, "origin" for git). Space-separated lists of multiple remotes
+# also work (eg, "origin gitlab github" for git).
 PUSH_REMOTE="origin"