Update default generated files

kali-config/common/includes.installer/kali-finish-install

@@ -51,17 +51,24 @@ configure_zsh() {
     done
 }
 
-configure_kaboxer() {
+# This is generically named in case we want to add other groups in the future.
-    # Create the group if needed
+configure_usergroups() {
+  # Create the kaboxer group if needed
   addgroup --system kaboxer || true
+  # Create the wireshark group if needed
+  addgroup --system wireshark || true
+
+  # kaboxer - for kaboxer
+  # dialout - for serial access
+  # wireshark - capture sessions in wireshark
+  kali_groups="kaboxer,dialout,wireshark"
 
-    # Add the users to the group
   for user in $(get_user_list); do
-	echo "INFO: adding user '$user' to group 'kaboxer'"
+      echo "INFO: adding user '$user' to groups '$kali_groups'"
-	adduser $user kaboxer || true
+      usermod -a -G "$kali_groups" $user || true
   done
 }
 
 configure_sources_list
 configure_zsh
-configure_kaboxer
+configure_usergroups

simple-cdd/profiles/kali.postinst

@@ -51,17 +51,24 @@ configure_zsh() {
     done
 }
 
-configure_kaboxer() {
+# This is generically named in case we want to add other groups in the future.
-    # Create the group if needed
+configure_usergroups() {
+  # Create the kaboxer group if needed
   addgroup --system kaboxer || true
+  # Create the wireshark group if needed
+  addgroup --system wireshark || true
+
+  # kaboxer - for kaboxer
+  # dialout - for serial access
+  # wireshark - capture sessions in wireshark
+  kali_groups="kaboxer,dialout,wireshark"
 
-    # Add the users to the group
   for user in $(get_user_list); do
-	echo "INFO: adding user '$user' to group 'kaboxer'"
+      echo "INFO: adding user '$user' to groups '$kali_groups'"
-	adduser $user kaboxer || true
+      usermod -a -G "$kali_groups" $user || true
   done
 }
 
 configure_sources_list
 configure_zsh
-configure_kaboxer
+configure_usergroups