saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 0f9c074654192c171232f8516dd385f7c38ad0c3..ec7a1bff65699630799ff1fa02d4510125665a45 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2490,9 +2490,9 @@ maybe chgrp 'ssl-cert' 'ssl/private/ssl-cert-snakeoil.key'
 maybe chmod 0640 'ssl/private/ssl-cert-snakeoil.key'
 maybe chmod 0644 'su-to-rootrc'
 maybe chmod 0644 'subgid'
-maybe chmod 0600 'subgid-'
+maybe chmod 0644 'subgid-'
 maybe chmod 0644 'subuid'
-maybe chmod 0600 'subuid-'
+maybe chmod 0644 'subuid-'
 maybe chmod 0755 'subversion'
 maybe chmod 0644 'subversion/config'
 maybe chmod 0644 'subversion/servers'

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index ddbd592f3dc6aa04371182826a361bbbbfbcf5dc..eb735a42f7cf67fca6cef1330bebb200dde4bfaa 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -25,7 +25,7 @@ Info HP Color LaserJet MFP M277dw
 MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended)
 DeviceURI socket://192.168.178.254
 State Idle
-StateTime 1535619758
+StateTime 1536142070
 ConfigTime 1496773872
 Type 8425500
 Accepting Yes
@@ -80,14 +80,14 @@ OpPolicy default
 ErrorPolicy retry-job
 </Printer>
 <Printer HP_Color_LaserJet_MFP_M277dw_9D0E59_>
-UUID urn:uuid:b45da962-9d0a-359c-6fd3-ab75a1085329
+UUID urn:uuid:25cf3718-8eee-3f7d-6919-469d54ab56ae
 Info 
 Location 
 MakeModel Color LaserJet MFP M277dw
 DeviceURI ipp://NPI9D0E59.local:631/ipp/print
 State Idle
-StateTime 1535657198
-ConfigTime 1535657201
+StateTime 1536394957
+ConfigTime 1536394960
 Type 4188
 Accepting Yes
 Shared No

diff --git a/group b/group
index 18d7b827793a96275c609729de0730c5af523455..96ca5d031047d995ef30f68f7e81a7dbfcd1058e 100644 (file)
--- a/group
+++ b/group
@@ -80,3 +80,4 @@ bitcoin:x:138:
 ntp:x:105:
 nvidia-persistenced:x:131:
 bumblebee:x:998:mhoellein,syslog
+alle:x:1014:

diff --git a/group- b/group-
index 9e387487a6d990da9b00fb539b95fb4f18315ea2..18d7b827793a96275c609729de0730c5af523455 100644 (file)
--- a/group-
+++ b/group-
@@ -79,4 +79,4 @@ susi:x:1013:
 bitcoin:x:138:
 ntp:x:105:
 nvidia-persistenced:x:131:
-bumblebee:x:998:mhoellein
+bumblebee:x:998:mhoellein,syslog

diff --git a/gshadow b/gshadow
index 48e0edde082da232fa669e7bdd7704541d7f2414..82a92bdebb66d9c0d7129be1d16746a66ead9ebf 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -80,3 +80,4 @@ bitcoin:!::
 ntp:!::
 nvidia-persistenced:!::
 bumblebee:!::mhoellein,syslog
+alle:!::

diff --git a/gshadow- b/gshadow-
index f88caf76590206924746f437037838c4f90010d9..48e0edde082da232fa669e7bdd7704541d7f2414 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -79,4 +79,4 @@ susi:!::
 bitcoin:!::
 ntp:!::
 nvidia-persistenced:!::
-bumblebee:!::mhoellein
+bumblebee:!::mhoellein,syslog

diff --git a/passwd b/passwd
index 2789531d22d06cb00bdc2bd63c6c221af42b28c1..4d48e3bc924124e2c18fe28532959c224d49b144 100644 (file)
--- a/passwd
+++ b/passwd
@@ -49,3 +49,4 @@ 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
 nvidia-persistenced:x:123:131:NVIDIA Persistence Daemon,,,:/nonexistent:/sbin/nologin
+alle:x:1013:1014::/home/alle:/bin/false

diff --git a/passwd- b/passwd-
index c7842960859f443457fa922b77290285a2611645..2789531d22d06cb00bdc2bd63c6c221af42b28c1 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -44,8 +44,8 @@ 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
-nvidia-persistenced:x:123:131::/nonexistent:/sbin/nologin
+nvidia-persistenced:x:123:131:NVIDIA Persistence Daemon,,,:/nonexistent:/sbin/nologin

diff --git a/shadow b/shadow
index 28b015f1f4acdd5874b709ce33748d7724712ade..3de9b31f15db60f896412170b7868c0c5bb54821 100644 (file)
--- a/shadow
+++ b/shadow
@@ -49,3 +49,4 @@ bitcoin:*:17765:0:99999:7:::
 cups-pk-helper:*:17767:0:99999:7:::
 ntp:*:17771:0:99999:7:::
 nvidia-persistenced:*:17774:0:99999:7:::
+alle:!:17781:0:99999:7:::

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

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/subuid b/subuid
index 43587cbe756387ca5929b8bcb6c692fc37ca6180..c155fe98275634d9fd93fec218bf2cd83e5a0c93 100644 (file)
--- a/subuid
+++ b/subuid
@@ -1,2 +1,3 @@
-mhoellein:165536:65536
 susi:100000:65536
+mhoellein:165536:65536
+alle:231072: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