From 8d8430c7125976e42f4804de5c0038f8b23ba66b Mon Sep 17 00:00:00 2001
From: Gorden Mende <gorden.mende@solusar.de>
Date: Fri, 8 Jul 2022 10:09:34 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 group      | 3 +--
 group-     | 1 +
 gshadow    | 1 -
 gshadow-   | 1 +
 login.defs | 2 +-
 passwd     | 1 -
 shadow     | 1 -
 subgid     | 1 -
 subgid-    | 1 +
 subuid     | 1 -
 subuid-    | 1 +
 11 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/group b/group
index b5a3f809..1ac41888 100644
--- a/group
+++ b/group
@@ -66,6 +66,5 @@ postgrey:x:124:
 amavis:x:125:
 vmail:x:5000:
 cmk-agent:x:998:
-wheel:x:1004:caelebfi,pi
-pi:x:5001:
+wheel:x:1004:caelebfi
 unbound:x:126:
diff --git a/group- b/group-
index eec352e0..b5a3f809 100644
--- a/group-
+++ b/group-
@@ -68,3 +68,4 @@ vmail:x:5000:
 cmk-agent:x:998:
 wheel:x:1004:caelebfi,pi
 pi:x:5001:
+unbound:x:126:
diff --git a/gshadow b/gshadow
index b6a8e77f..27943d83 100644
--- a/gshadow
+++ b/gshadow
@@ -65,5 +65,4 @@ opendkim:!::
 postgrey:!::
 amavis:!::
 cmk-agent:!::
-pi:!::
 unbound:!::
diff --git a/gshadow- b/gshadow-
index 296b8840..b6a8e77f 100644
--- a/gshadow-
+++ b/gshadow-
@@ -66,3 +66,4 @@ postgrey:!::
 amavis:!::
 cmk-agent:!::
 pi:!::
+unbound:!::
diff --git a/login.defs b/login.defs
index 0ea3cb79..adb55db4 100644
--- a/login.defs
+++ b/login.defs
@@ -148,7 +148,7 @@ TTYPERM		0600
 #
 ERASECHAR	0177
 KILLCHAR	025
-UMASK		022
+UMASK		027
 
 #
 # Password aging controls:
diff --git a/passwd b/passwd
index 2fa93a87..cfcf9869 100644
--- a/passwd
+++ b/passwd
@@ -37,5 +37,4 @@ postgrey:x:115:124::/var/lib/postgrey:/usr/sbin/nologin
 amavis:x:116:125:AMaViS system user,,,:/var/lib/amavis:/bin/sh
 vmail:x:5000:5000::/var/opt/vmail:/bin/false
 cmk-agent:x:998:998:Checkmk agent system user:/var/lib/cmk-agent:/bin/false
-pi:x:5001:5001::/home/pi:/bin/bash
 unbound:x:117:126::/var/lib/unbound:/usr/sbin/nologin
diff --git a/shadow b/shadow
index 09c382ed..48858e41 100644
--- a/shadow
+++ b/shadow
@@ -37,5 +37,4 @@ postgrey:*:19179:0:99999:7:::
 amavis:*:19179:0:99999:7:::
 vmail:x:17686:0:99999:7:::
 cmk-agent:!:19179::::::
-pi:!:19179:0:99999:7:::
 unbound:*:19180:0:99999:7:::
diff --git a/subgid b/subgid
index fc0c76a9..f4f94208 100644
--- a/subgid
+++ b/subgid
@@ -1,2 +1 @@
 caelebfi:100000:65536
-pi:165536:65536
diff --git a/subgid- b/subgid-
index f4f94208..fc0c76a9 100644
--- a/subgid-
+++ b/subgid-
@@ -1 +1,2 @@
 caelebfi:100000:65536
+pi:165536:65536
diff --git a/subuid b/subuid
index fc0c76a9..f4f94208 100644
--- a/subuid
+++ b/subuid
@@ -1,2 +1 @@
 caelebfi:100000:65536
-pi:165536:65536
diff --git a/subuid- b/subuid-
index f4f94208..fc0c76a9 100644
--- a/subuid-
+++ b/subuid-
@@ -1 +1,2 @@
 caelebfi:100000:65536
+pi:165536:65536