From 07e0659c936bb124b8b825936fa612bcd7b61800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ramon=20Buld=C3=B3?= Date: Sat, 6 Jun 2015 13:43:00 +0200 Subject: [PATCH] Re-add optional autologin in livecd --- lib/util.sh | 2 ++ scripts/livecd | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/util.sh b/lib/util.sh index 53fbfec..8a645b7 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -425,6 +425,8 @@ load_profile_config(){ [[ -z ${displaymanager} ]] && displaymanager="none" + [[ -z ${autologin} ]] && autologin="true" + [[ -z ${default_desktop_executable} ]] && default_desktop_executable="none" [[ -z ${default_desktop_file} ]] && default_desktop_file="none" diff --git a/scripts/livecd b/scripts/livecd index 778d82d..35249bb 100755 --- a/scripts/livecd +++ b/scripts/livecd @@ -44,7 +44,9 @@ depmod $(cat /usr/lib/modules/$(uname -r)/extramodules/version) install_localization -configure_displaymanager_autologin +if [[ ${autologin} == "true" ]] ; then + configure_displaymanager_autologin +fi echo "configure root password" >> /var/log/livecd.log