summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlackNoxis <steven.darklight@gmail.com>2015-06-28 09:54:31 +0300
committerBlackNoxis <steven.darklight@gmail.com>2015-06-28 09:54:31 +0300
commita799a61536819edeb6bcea92845d180a2deb0a0c (patch)
tree4db15ef20fc9afc086e951bf9d9002be35caec25
parent4a6af9fd754f1f44ff2627232bcc39f5ee571a93 (diff)
fixed lightdm with pam autologin
-rw-r--r--kogaion-functions.sh5
-rw-r--r--kogaion-welcome-loader6
2 files changed, 7 insertions, 4 deletions
diff --git a/kogaion-functions.sh b/kogaion-functions.sh
index 586c02d..fde35be 100644
--- a/kogaion-functions.sh
+++ b/kogaion-functions.sh
@@ -10,7 +10,7 @@ OEM_FILE_NEW="/etc/oem/liveboot.sh"
LIVE_USER_GROUPS="audio bumblebee cdrom cdrw clamav console entropy games \
kvm lp lpadmin messagebus plugdev polkituser portage pulse pulse-access pulse-rt \
scanner usb users uucp vboxguest vboxusers video wheel"
-LIVE_USER=${ROGENTOS_USER:-kogaionuser}
+LIVE_USER=${KOGAION_USER:-kogaionuser}
kogaion_setup_autologin() {
# GDM - GNOME
@@ -62,6 +62,9 @@ kogaion_setup_autologin() {
if [ -f "$LIGHTDM_FILE" ]; then
sed -i "s/autologin-user=.*/autologin-user=${LIVE_USER}/" $LIGHTDM_FILE
sed -i "/^#.*autologin-user=/ s/^#//" $LIGHTDM_FILE
+ sed -i "s/pam-service=.*/pam-service=lightdm-autologin/" $LIGHTDM_FILE
+ sed -i "/^#.*pam-service=/ s/^#//" $LIGHTDM_FILE
+ sed -i "/^#.*autologin-user-timeout=/ s/^#//" $LIGHTDM_FILE
fi
# Setup correct login session
diff --git a/kogaion-welcome-loader b/kogaion-welcome-loader
index bbb0c60..2b6afe5 100644
--- a/kogaion-welcome-loader
+++ b/kogaion-welcome-loader
@@ -1,10 +1,10 @@
#!/bin/sh
-ROGENTOS_LOADER="/usr/bin/xdg-open"
-ROGENTOS_URL=${ROGENTOS_URL:-http://www.kogaion.ro?install_welcome=1}
+KOGAION_LOADER="/usr/bin/xdg-open"
+KOGAION_URL=${KOGAION_URL:-http://www.kogaion.ro?install_welcome=1}
# load Sabayon URL
-[[ -x "${ROGENTOS_LOADER}" ]] && ${ROGENTOS_LOADER} ${ROGENTOS_URL} &
+[[ -x "${KOGAION_LOADER}" ]] && ${KOGAION_LOADER} ${KOGAION_URL} &
# remove myself from autostart
rm ~/.config/autostart/kogaion-welcome-loader.desktop -f