saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 121a60a7307d17a1fd792d175db0bc5940d0c8fe..271f5041818dbd810610d8e2441e3630397dc0e6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -542,12 +542,14 @@ maybe chmod 0644 'apt/sources.list.d/teamviewer.list'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/teamviewer.list.save'
 maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list'
+maybe chmod 0644 'apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save'
 maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/webupd8team-ubuntu-java-xenial.list.save'
 maybe chmod 0644 'apt/sources.list.d/xenial-partner.list'
 maybe chmod 0644 'apt/sources.list.d/xenial-partner.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/xenial-partner.list.save'
+maybe chmod 0644 'apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list'
 maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list'
 maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list.distUpgrade'
 maybe chmod 0644 'apt/sources.list.d/yubico-ubuntu-stable-xenial.list.save'
@@ -566,6 +568,7 @@ maybe chmod 0644 'apt/trusted.gpg.d/teejee2008_ubuntu_ppa.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-archive.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/ubuntu-keyring-2012-cdimage.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/webupd8team_ubuntu_java.gpg'
+maybe chmod 0644 'apt/trusted.gpg.d/yg-jensge_ubuntu_shotwell.gpg'
 maybe chmod 0644 'apt/trusted.gpg.d/yubico_ubuntu_stable.gpg'
 maybe chmod 0755 'aptdaemon'
 maybe chmod 0755 'aptdaemon/high-trust-repository-whitelist.d'

diff --git a/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save
new file mode 100644 (file)
index 0000000..117c698
--- /dev/null
+++ b/apt/sources.list.d/teejee2008-ubuntu-ppa-bionic.list.save
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/teejee2008/ppa/ubuntu bionic main
+# deb-src http://ppa.launchpad.net/teejee2008/ppa/ubuntu bionic main

diff --git a/apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list
new file mode 100644 (file)
index 0000000..833230a
--- /dev/null
+++ b/apt/sources.list.d/yg-jensge-ubuntu-shotwell-bionic.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/yg-jensge/shotwell/ubuntu bionic main
+# deb-src http://ppa.launchpad.net/yg-jensge/shotwell/ubuntu bionic main

diff --git a/apt/trusted.gpg.d/yg-jensge_ubuntu_shotwell.gpg b/apt/trusted.gpg.d/yg-jensge_ubuntu_shotwell.gpg
new file mode 100644 (file)
index 0000000..71989ef
Binary files /dev/null and b/apt/trusted.gpg.d/yg-jensge_ubuntu_shotwell.gpg differ

diff --git a/passwd b/passwd
index ac301867ff6b3a8f6046a1c590007f0d7630365d..2789531d22d06cb00bdc2bd63c6c221af42b28c1 100644 (file)
--- a/passwd
+++ b/passwd
@@ -44,7 +44,7 @@ postfix:x:125:132::/var/spool/postfix:/bin/false
 davfs2:x:126:136::/var/cache/davfs2:/bin/false
 mongodb:x:127:65534::/var/lib/mongodb:/bin/false
 trezord:x:999:999:TREZOR Bridge:/var:/bin/false
-susi:x:1012:1013:Susanne Weber:/home/susi:
+susi:x:1012:1013:Susanne Weber:/home/susi:/bin/bash
 bitcoin:x:128:138::/var/lib/bitcoin:/bin/false
 cups-pk-helper:x:129:113:user for cups-pk-helper service,,,:/home/cups-pk-helper:/usr/sbin/nologin
 ntp:x:103:105::/nonexistent:/usr/sbin/nologin