diff options
| -rwxr-xr-x | scripts/live-bottom/15autologin | 10 | ||||
| -rwxr-xr-x | scripts/live-bottom/20xconfig | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin index ae653fd..bb9902e 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -20,17 +20,17 @@ esac # live-initramfs header +if [ -n "${NOXAUTOLOGIN}" ] +then + exit 0 +fi + . /scripts/live-functions log_begin_msg "Setting up automatic login" # live-initramfs script -if [ -n "${NOXAUTOLOGIN}" ] -then - exit 0 -fi - # chroot needed to handle symlinks correctly if chroot /root [ -f /etc/gdm/gdm-cdd.conf ] then diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig index 4a80b21..c06a505 100755 --- a/scripts/live-bottom/20xconfig +++ b/scripts/live-bottom/20xconfig @@ -27,8 +27,6 @@ fi . /scripts/live-functions -log_begin_msg "Configuring X" - # live-initramfs script if [ "${TERM_TYPE}" = "serial" ] @@ -48,6 +46,8 @@ then exit 0 fi +log_begin_msg "Configuring X" + locale=en_US.UTF-8 mount -n -o bind /sys /root/sys |