stage3: Don't overwrite default-groups config file

There can be file with another set of groups already. So merge these files.

stage3: Don't overwrite default-groups config file
dd540bcf · Mikhail Efremov · d67d8b18 · dd540bcf
Commit dd540bcf authored Dec 06, 2021 by Mikhail Efremov
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

80-setup-user-groups ...-distro-alt-workstation/preinstall.d/80-setup-user-groups +12 -1

No files found.
--- a/installer-distro-alt-workstation/preinstall.d/80-setup-user-groups
+++ b/installer-distro-alt-workstation/preinstall.d/80-setup-user-groups
@@ -2,8 +2,11 @@

 . install2-init-functions

+DF_FILE="$destdir/usr/share/install3/default-groups"
+
 mkdir -p $destdir/usr/share/install3/
-cat > $destdir/usr/share/install3/default-groups <<__EOF__
+
+cat > /tmp/default-groups_a <<__EOF__
 wheel
 proc
 cdwriter
@@ -20,3 +23,11 @@ vboxusers
 vmusers
 users
 __EOF__
+
+if [ -s "$DF_FILE" ]; then
+	sed 's/[[:blank:]]/\n/g' "$DF_FILE" >/tmp/default-groups_b
+	sort -u /tmp/default-groups_a /tmp/default-groups_b >"$DF_FILE"
+	rm /tmp/default-groups_a /tmp/default-groups_b
+else
+	mv /tmp/default-groups_a "$DF_FILE"
+fi