Merge remote-tracking branch 'ArrayBolt3/arraybolt3/trixie'

Author: adrelanos

usr/sbin/autologinchange

@@ -462,16 +462,21 @@ fi
 ## safely manage those
 ## TODO: consider cases with leading spaces
 ## TODO: ignore comments
-if grep --quiet --recursive --ignore-case -- '^\[Seat:[^*]' /etc/lightdm; then
-   printf '%s\n' "ERROR: Multi-seat lightdm configuration detected, cannot proceed!" >&2
-   exit 1
+if [ -d /etc/lightdm ]; then
+   if grep --quiet --recursive --ignore-case -- '^\[Seat:[^*]' /etc/lightdm; then
+      printf '%s\n' "ERROR: Multi-seat lightdm configuration detected, cannot proceed!" >&2
+      exit 1
+   fi
 fi
 
-readarray -t autologin_users_lightdm < <(
-   grep --recursive --ignore-case -- '^autologin-user=' /etc/lightdm \
-      | filter_out_sysmaint_maybe \
-      | awk -F'=' '{ print $NF }' || true
-) || true
+autologin_users_lightdm=()
+if [ -d /etc/lightdm ]; then
+   readarray -t autologin_users_lightdm < <(
+      grep --recursive --ignore-case -- '^autologin-user=' /etc/lightdm \
+         | filter_out_sysmaint_maybe \
+         | awk -F'=' '{ print $NF }' || true
+   ) || true
+fi
 true "INFO: Collected list of users with lightdm autologin enabled."
 
 readarray -t autologin_users_sddm < <(
@@ -487,11 +492,23 @@ readarray -t autologin_users_sddm < <(
 ) || true
 true "INFO: Collected list of users with sddm autologin enabled."
 
+readarray -t autologin_users_greetd < <(
+   for file_name in /etc/greetd/config.toml.d/*; do
+      if ! [ -f "${file_name}" ]; then
+         continue
+      fi
+      get_config_section "${file_name}" 'initial_session' \
+         | grep -- '^user\s*=\s*"[^"]*"$' \
+         | filter_out_sysmaint_maybe \
+         | sed 's/^.*"\([^"]*\)"$/\1/' || true
+   done
+) || true
+
 readarray -t autologin_users < <(
-  IFS=$'\n'
-  printf '%s\n%s\n' \
-     "${autologin_users_lightdm[*]}" \
-     "${autologin_users_sddm[*]}" \
+  printf '%s\n' \
+     "${autologin_users_lightdm[@]}" \
+     "${autologin_users_sddm[@]}" \
+     "${autologin_users_greetd[@]}" \
      | sed '/^$/d' \
      | sort -u
 )

usr/sbin/rebuild-dkms-modules

@@ -20,7 +20,8 @@ source /usr/libexec/helper-scripts/as_root.sh
 source /usr/libexec/helper-scripts/has.sh
 
 rebuild_dkms_modules() {
-  local dkms_mod_status_item dkms_mod_name dkms_mod_kernel dkms_mod_status
+  local dkms_mod_status_item dkms_mod_name dkms_mod_kernel dkms_mod_status \
+    dkms_build_count
 
   as_root
 
@@ -32,6 +33,7 @@ rebuild_dkms_modules() {
 
   log notice 'Rebuilding DKMS modules...'
 
+  dkms_build_count='0'
   while IFS= read -r dkms_mod_status_item; do
     if ! [[ "${dkms_mod_status_item}" \
       =~ ^([^,]*),\ ([^,]*),\ [^:]*:\ (.*)$ ]]; then
@@ -57,9 +59,14 @@ rebuild_dkms_modules() {
       continue
     fi
     log notice "Successfully rebuilt DKMS module '${dkms_mod_name}' for kernel '${dkms_mod_kernel}'."
+    (( dkms_build_count++ )) || true
   done < <(dkms status)
 
-  log notice 'Done rebuilding DKMS modules.'
+  if [ "${dkms_build_count}" = '0' ]; then
+    log notice 'No DKMS modules to rebuild, ok.'
+  else
+    log notice 'Done rebuilding DKMS modules.'
+  fi
 }
 
 rebuild_dkms_modules