From da484826f4c4677cff8a4128fedacf87a3c9bb33 Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <arnaudr@kali.org>
Date: Mon, 4 Apr 2022 15:18:53 +0700
Subject: [PATCH] Nitpicks in kali-{user-setup,finish-install}

Changes:
- order groups alphabetically
- use the same comment "Ensure those groups exist" consistently in the 2
  scripts, and also drop the comment regarding a "generically named"
  function.
- adds "|| true" to the usermod command in kali-user-setup (only for
  consistency, the script is not run with "set -e" anyway).

After those changes, the two functions "configure_usergroups()" are very
similar, and it's very easy to spot the differences between both.
---
 .../usr/lib/live/config/0031-kali-user-setup         | 12 +++++++-----
 .../common/includes.installer/kali-finish-install    |  8 +++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
index cdde35e..5fc6df0 100755
--- a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
+++ b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
@@ -14,15 +14,17 @@ configure_zsh() {
 }
 
 configure_usergroups() {
-    addgroup --system kaboxer || true  # Ensures the group exists
-    addgroup --system wireshark || true  # Ensures the group exists
+    # Ensure those groups exist
+    addgroup --system kaboxer || true
+    addgroup --system wireshark || true
+
     # adm - read access to log files
-    # kaboxer - for kaboxer
     # dialout - for serial port access
+    # kaboxer - for kaboxer
     # wireshark - capture sessions without being root
-    kali_groups="adm,kaboxer,dialout,wireshark"
+    kali_groups="adm,dialout,kaboxer,wireshark"
 
-    usermod -a -G $kali_groups kali
+    usermod -a -G $kali_groups kali || true
 }
 
 # Avoid configuring multiple times in case persistence is enabled
diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install
index 99d691a..11e7e2e 100755
--- a/kali-config/common/includes.installer/kali-finish-install
+++ b/kali-config/common/includes.installer/kali-finish-install
@@ -51,18 +51,16 @@ configure_zsh() {
     done
 }
 
-# This is generically named in case we want to add other groups in the future.
 configure_usergroups() {
-    # Create the kaboxer group if needed
+    # Ensure those groups exist
     addgroup --system kaboxer || true
-    # Create the wireshark group if needed
     addgroup --system wireshark || true
 
     # adm - read access to log files
-    # kaboxer - for kaboxer
     # dialout - for serial access
+    # kaboxer - for kaboxer
     # wireshark - capture sessions in wireshark
-    kali_groups="adm,kaboxer,dialout,wireshark"
+    kali_groups="adm,dialout,kaboxer,wireshark"
 
     for user in $(get_user_list | grep -xv root); do
 	echo "INFO: adding user '$user' to groups '$kali_groups'"