x11-autologin: harden the previous commit

It could result in a broken config given broken chroot state; it's of no practical difference as both cases just won't work but we can at least provide meaningful diagnostics (and a bit of perfectionism, heh). Fixes: 2527fe94da2e810cf5d52cf548f84456fd5a6b4d

x11-autologin: harden the previous commit
38e149a7 · Michael Shigorin · 5b7c1893 · 38e149a7
Commit 38e149a7 authored May 27, 2019 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

40-x11-autologin ....in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin +7 -1

No files found.
--- a/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin
+++ b/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin
@@ -56,10 +56,16 @@ LIGHTDM_CONF=/etc/lightdm/lightdm.conf
 if [ -f "$LIGHTDM_CONF" ]; then
 	backup "$LIGHTDM_CONF"
 	default_session="$(ls -1 /usr/share/xsessions/*.desktop | sed -n 's/^.*\/\([^/]\+\)\.desktop$/\1/;1p')"
+	if [ -n "$default_session" ]; then
+		sed -i \
+			-e "s/^#(autologin-session=).*$/\1$default_session/" \
+			"$LIGHTDM_CONF"
+	else
+		echo "** WARNING: no sessions found in /usr/share/xsessions/" >&2
+	fi
 	sed -i \
 		-e "s/^#\(autologin-user=\).*$/\1$USER/" \
 		-e "s/^#\(autologin-user-timeout=0\)/\1/" \
-		-e "s/^#(autologin-session=).*$/\1$default_session/" \
 		"$LIGHTDM_CONF"
 	backup "/etc/group"
 	add_nopasswdlogin_group lightdm ||: