From: Mario Höllein <mhoellein@freenet.de>
Date: Tue, 19 Jun 2018 12:52:07 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=f222929fe9aa51caa7e8bcb46871e996ef34dea7;p=zenbook

saving uncommitted changes in /etc prior to apt run
---

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index da48bb3..e5946a0 100644
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -38,13 +38,13 @@ OpPolicy default
 ErrorPolicy retry-job
 </Printer>
 <Printer TEST>
-UUID urn:uuid:41dcf8c7-d846-3311-7f6b-4a943c10237f
+UUID urn:uuid:d78788e6-f7c1-3413-5af5-fb69250922d4
 Info TEST @ linux-a5xv
 Location linux-a5xv.local
-DeviceURI ipps://linux-a5xv.local:631/printers/TEST
+DeviceURI ipp://linux-a5xv.local:631/printers/TEST
 State Idle
-StateTime 1529306744
-ConfigTime 1529306744
+StateTime 1529403358
+ConfigTime 1529403358
 Type 6
 Accepting Yes
 Shared No
diff --git a/etckeeper/etckeeper.conf b/etckeeper/etckeeper.conf
index fd9cfb8..4bf29ee 100644
--- a/etckeeper/etckeeper.conf
+++ b/etckeeper/etckeeper.conf
@@ -27,7 +27,7 @@ AVOID_DAILY_AUTOCOMMITS=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
+#AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
 # (apt, pacman-g2, yum, dnf, zypper etc)
@@ -40,4 +40,4 @@ LOWLEVEL_PACKAGE_MANAGER=dpkg
 # 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=""
+PUSH_REMOTE="origin"