saving uncommitted changes in /etc prior to apt run

diff --git a/alternatives/editor b/alternatives/editor
index 7a06612bbb735f6844e02ecae16115e11e394441..0d516727a87dc4e9448fb76726171b586f08142a 120000 (symlink)
--- a/alternatives/editor
+++ b/alternatives/editor
@@ -1 +1 @@
-/bin/nano
\ No newline at end of file
+/usr/bin/vim.tiny
\ No newline at end of file

diff --git a/alternatives/editor.1.gz b/alternatives/editor.1.gz
index bb2d082cddedb565311bf288210c3bcb68d5ee0a..e02a6af1693ae4e6c7f34499002ee72d0e73a7a5 120000 (symlink)
--- a/alternatives/editor.1.gz
+++ b/alternatives/editor.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/nano.1.gz
\ No newline at end of file
+/usr/share/man/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.fr.1.gz b/alternatives/editor.fr.1.gz
new file mode 120000 (symlink)
index 0000000..af52858
--- /dev/null
+++ b/alternatives/editor.fr.1.gz
@@ -0,0 +1 @@
+/usr/share/man/fr/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.it.1.gz b/alternatives/editor.it.1.gz
new file mode 120000 (symlink)
index 0000000..4498a3d
--- /dev/null
+++ b/alternatives/editor.it.1.gz
@@ -0,0 +1 @@
+/usr/share/man/it/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.ja.1.gz b/alternatives/editor.ja.1.gz
new file mode 120000 (symlink)
index 0000000..071acfb
--- /dev/null
+++ b/alternatives/editor.ja.1.gz
@@ -0,0 +1 @@
+/usr/share/man/ja/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.pl.1.gz b/alternatives/editor.pl.1.gz
new file mode 120000 (symlink)
index 0000000..345590a
--- /dev/null
+++ b/alternatives/editor.pl.1.gz
@@ -0,0 +1 @@
+/usr/share/man/pl/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.ru.1.gz b/alternatives/editor.ru.1.gz
new file mode 120000 (symlink)
index 0000000..ea9aa16
--- /dev/null
+++ b/alternatives/editor.ru.1.gz
@@ -0,0 +1 @@
+/usr/share/man/ru/man1/vim.1.gz
\ No newline at end of file

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index c84fbb57b7c6d87249db9d974e99703246d2334b..9fe5bece725bbf13056d6400686f8e20fdf3cec9 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -79,3 +79,22 @@ KLimit 0
 OpPolicy default
 ErrorPolicy retry-job
 </Printer>
+<Printer TEST>
+UUID urn:uuid:5c45504b-9b54-3064-76ec-a4c99a3c7d6d
+Info TEST @ linux-a5xv
+Location linux-a5xv.local
+DeviceURI ipps://linux-a5xv.local:631/printers/TEST
+State Idle
+StateTime 1533706502
+ConfigTime 1533706502
+Type 6
+Accepting Yes
+Shared No
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy retry-job
+Option cups-browsed true
+</Printer>

diff --git a/group b/group
index f6eef9770d9acd062d3294cac06e6007a00ca04d..049f1d4fed60ffd36c2a86beecca94b29f7fba6e 100644 (file)
--- a/group
+++ b/group
@@ -77,3 +77,4 @@ davfs2:x:136:mhoellein
 mongodb:x:137:mongodb
 trezord:x:999:
 u2fkey:x:1012:mhoellein
+susi:x:1013:

diff --git a/group- b/group-
index bba470580d0aca7c74a150af06f57ece39fd6584..f6eef9770d9acd062d3294cac06e6007a00ca04d 100644 (file)
--- a/group-
+++ b/group-
@@ -76,4 +76,4 @@ wireshark:x:135:
 davfs2:x:136:mhoellein
 mongodb:x:137:mongodb
 trezord:x:999:
-u2fkey:x:1012:
+u2fkey:x:1012:mhoellein

diff --git a/gshadow b/gshadow
index bb1c9ce9cae723ba278483d552d6319f3a478dcc..d7746260dcaa1e3588ad786c61b0aa57b67a78d5 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -77,3 +77,4 @@ davfs2:!::mhoellein
 mongodb:!::mongodb
 trezord:!::
 u2fkey:!::mhoellein
+susi:!::

diff --git a/gshadow- b/gshadow-
index f86c24152d3a8cb1b624e91d1a97323dbf53f469..bb1c9ce9cae723ba278483d552d6319f3a478dcc 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -76,4 +76,4 @@ wireshark:!::
 davfs2:!::mhoellein
 mongodb:!::mongodb
 trezord:!::
-u2fkey:!::
+u2fkey:!::mhoellein

diff --git a/passwd b/passwd
index 84470ba53f5a193adef1793a8724d5eba3cf2208..f033be9fb1fe917e4f1877f75ad4508bdc00fc6d 100644 (file)
--- a/passwd
+++ b/passwd
@@ -46,3 +46,4 @@ 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:

diff --git a/passwd- b/passwd-
index 7770a52986689226e1e980360750ac548bb09edc..84470ba53f5a193adef1793a8724d5eba3cf2208 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -45,3 +45,4 @@ nvidia-persistenced:x:123:131:NVIDIA Persistence Daemon,,,:/:/sbin/nologin
 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

diff --git a/shadow b/shadow
index e33a6673e136d61df66453a4793b99686aac7962..7b3c085ccdc05744923955635aa0c0e8cc982c6e 100644 (file)
--- a/shadow
+++ b/shadow
@@ -46,3 +46,4 @@ postfix:*:17326:0:99999:7:::
 davfs2:*:17416:0:99999:7:::
 mongodb:*:17457:0:99999:7:::
 trezord:!:17738::::::
+susi:$6$Fcb59jpZ$88N57qIZj1cwxBeklmMoGkFkCmnSpNxC.eWkAVzDAtmgdCiEDdWDXz4XvOdl.VThcynXtWeonUNCKUvLfku2J0:17751:0:99999:7:::

diff --git a/shadow- b/shadow-
index 39ab258bfa5179ffa2d3d62e463cef6b8c9bb462..e33a6673e136d61df66453a4793b99686aac7962 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -45,3 +45,4 @@ nvidia-persistenced:*:17325:0:99999:7:::
 postfix:*:17326:0:99999:7:::
 davfs2:*:17416:0:99999:7:::
 mongodb:*:17457:0:99999:7:::
+trezord:!:17738::::::

diff --git a/subgid b/subgid
index 4810f7789c8d8fa8e42554237fb4975d6d846420..43587cbe756387ca5929b8bcb6c692fc37ca6180 100644 (file)
--- a/subgid
+++ b/subgid
@@ -1 +1,2 @@
 mhoellein:165536:65536
+susi:100000:65536

diff --git a/subgid- b/subgid-
index 7aacaafdf8dbbd4700dfcefe56ce3e63d347a60f..4810f7789c8d8fa8e42554237fb4975d6d846420 100644 (file)
--- a/subgid-
+++ b/subgid-
@@ -1,2 +1 @@
-oem:100000:65536
 mhoellein:165536:65536

diff --git a/subuid b/subuid
index 4810f7789c8d8fa8e42554237fb4975d6d846420..43587cbe756387ca5929b8bcb6c692fc37ca6180 100644 (file)
--- a/subuid
+++ b/subuid
@@ -1 +1,2 @@
 mhoellein:165536:65536
+susi:100000:65536

diff --git a/subuid- b/subuid-
index 7aacaafdf8dbbd4700dfcefe56ce3e63d347a60f..4810f7789c8d8fa8e42554237fb4975d6d846420 100644 (file)
--- a/subuid-
+++ b/subuid-
@@ -1,2 +1 @@
-oem:100000:65536
 mhoellein:165536:65536