carbon-config

commit 41f6122497161a6ba8b8ef5588bbefc6f03e5091
parent 9d8dc8c5a07e8bb0d0e6484017d7cdbe70df860b
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Fri, 16 Sep 2022 03:36:19 +0200

Align group membership with the current one.

Diffstat:
M
postinstall.aat
 | 
6
+++---
M
postinstall.fileset
 | 
18
+++++++++---------

2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/postinstall.aat b/postinstall.aat
@@ -95,9 +95,9 @@
 |line_append_file("sshd:x", ":22:", "", "^[^:]*:[^:]*")
 |line_append_file("ccx:x", ":1000:", "", "^[^:]*:[^:]*")
 # Groups for /dev permissions (mdevd.conf): disk, input, uucp
-|line_append_file("disk:x", ":6:", "root,adm,haldaemon", "^[^:]*:[^:]*")
-|line_append_file("input:x", ":966:", "", "^[^:]*:[^:]*")
-|line_append_file("uucp:x", ":14:", "", "^[^:]*:[^:]*")
+|line_append_file("disk:x", ":6:", "root,adm", "^[^:]*:[^:]*")
+|line_append_file("input:x", ":966:", "xorg", "^[^:]*:[^:]*")
+|line_append_file("uucp:x", ":14:", "ccx", "^[^:]*:[^:]*")
 
 /etc/passwd	f	+
 ?i	grep -q '^root:.*:{<root_shell>}$'
diff --git a/postinstall.fileset b/postinstall.fileset
@@ -14,23 +14,23 @@
 		printf '%s\n' 'ccx:x:1000:' >> "$fname"
 	fi
 # Groups for /dev permissions (mdevd.conf): disk, input, uucp
-?	grep -qEe '^disk:x:6:root,adm,haldaemon$' "$fname"
+?	grep -qEe '^disk:x:6:root,adm$' "$fname"
 !	if grep -qEe '^[^:]*:[^:]*:6:' "$fname"; then
-		sed -ire 's|^[^:]*:[^:]*:6:|disk:x:6:root,adm,haldaemon|' "$fname"
+		sed -ire 's|^[^:]*:[^:]*:6:|disk:x:6:root,adm|' "$fname"
 	else
-		printf '%s\n' 'disk:x:6:root,adm,haldaemon' >> "$fname"
+		printf '%s\n' 'disk:x:6:root,adm' >> "$fname"
 	fi
-?	grep -qEe '^input:x:966:$' "$fname"
+?	grep -qEe '^input:x:966:xorg$' "$fname"
 !	if grep -qEe '^[^:]*:[^:]*:966:' "$fname"; then
-		sed -ire 's|^[^:]*:[^:]*:966:|input:x:966:|' "$fname"
+		sed -ire 's|^[^:]*:[^:]*:966:|input:x:966:xorg|' "$fname"
 	else
-		printf '%s\n' 'input:x:966:' >> "$fname"
+		printf '%s\n' 'input:x:966:xorg' >> "$fname"
 	fi
-?	grep -qEe '^uucp:x:14:$' "$fname"
+?	grep -qEe '^uucp:x:14:ccx$' "$fname"
 !	if grep -qEe '^[^:]*:[^:]*:14:' "$fname"; then
-		sed -ire 's|^[^:]*:[^:]*:14:|uucp:x:14:|' "$fname"
+		sed -ire 's|^[^:]*:[^:]*:14:|uucp:x:14:ccx|' "$fname"
 	else
-		printf '%s\n' 'uucp:x:14:' >> "$fname"
+		printf '%s\n' 'uucp:x:14:ccx' >> "$fname"
 	fi
 
 /etc/passwd	f	+