diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/15autologin | 28 | ||||
| -rwxr-xr-x | scripts/live-bottom/25configure_init | 6 |
2 files changed, 21 insertions, 13 deletions
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin index 3f85d50..bee8d70 100755 --- a/scripts/live-bottom/15autologin +++ b/scripts/live-bottom/15autologin @@ -57,16 +57,24 @@ then ${GDMCONF} elif [ -d /root/etc/gdm3 ] then - -cat > /root/etc/gdm3/custom.conf << EOF -[daemon] -AutomaticLoginEnable=true -AutomaticLogin=$USERNAME -TimedLoginEnable=true -TimedLogin=$USERNAME -TimedLoginDelay=10 -EOF - + GDMCustomFile=/root/etc/gdm3/custom.conf + AutologinParameters="AutomaticLoginEnable=true\n\ +AutomaticLogin=$USERNAME\n\ +TimedLoginEnable=true\n\ +TimedLogin=$USERNAME\n\ +TimedLoginDelay=10" + + # Prevent from updating if parameters already present (persistent usb + # key) + if ! $(grep -qs 'AutomaticLoginEnable' $GDMCustomFile) + then + if $(grep -qs '\[daemon\]' $GDMCustomFile) + then + sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile + else + echo "[daemon]\n$AutologinParameters" >> $GDMCustomFile + fi + fi fi if [ -d /root/etc/default/kdm.d/ ] diff --git a/scripts/live-bottom/25configure_init b/scripts/live-bottom/25configure_init index 488a1dd..db23f19 100755 --- a/scripts/live-bottom/25configure_init +++ b/scripts/live-bottom/25configure_init @@ -108,10 +108,10 @@ then chmod -x /root/sbin/readahead-list fi -# Disable sreadahead too since we don't ship a pack file for it anyway, so -# all we'll end up doing is profiling the live CD boot. sreadahead also +# Disable ureadahead too since we don't ship a pack file for it anyway, so +# all we'll end up doing is profiling the live CD boot. ureadahead also # breaks partman occasionally by reading from its synchronisation FIFOs. -rm -f /root/etc/init/sreadahead.conf +rm -f /root/etc/init/ureadahead.conf log_end_msg |