From f4b0e49490b4d304a8c43c021ce89c96390dba2d Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 27 May 2019 20:44:03 +0300 Subject: [PATCH] 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 --- features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin b/features.in/x11-autologin/rootfs/image-scripts.d/40-x11-autologin index db71df0..36ba7b3 100755 --- 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 ||: -- 2.10.4