X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F15autologin;h=38c3a8f32de687d69f8cc8675beba26363f82010;hb=45a44dfbaec9d819567afa12238d9181dfbff5e6;hp=28a3141ba5e01ad3ef2bb8c4cea082b8f94323c7;hpb=2910ae281a07441f55215ca74ec38f1d499420f2;p=live-boot-grml.git diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin index 28a3141..38c3a8f 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -20,13 +20,15 @@ esac # live-initramfs header -. /scripts/live-functions +. /live.vars if [ -n "${NOXAUTOLOGIN}" ] || [ -z "${USERNAME}" ] then exit 0 fi +. /scripts/live-functions + log_begin_msg "Setting up automatic login" # live-initramfs script @@ -57,6 +59,8 @@ fi if [ -d /root/etc/default/kdm.d/ ] then + if ! grep -qs "^AUTOLOGIN" /root/etc/default/kdm.d/live-autologin + then cat >> /root/etc/default/kdm.d/live-autologin << EOF AUTOLOGINUSER=${USERNAME} @@ -64,6 +68,8 @@ AUTOLOGINAGAIN=true AUTOLOGINDELAY=0 EOF + fi + elif [ -f /root/etc/kde3/kdm/kdmrc ] then # Configure KDM autologin