From e89f9bc5f51010757a96618e531bbe83017418f4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 25 Jun 2016 11:01:58 +0100 Subject: [PATCH] Move dconf command to mesh startup script --- src/freedombone-image-customise | 3 --- src/freedombone-image-mesh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index e9b711f9..929f9c93 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -1153,9 +1153,6 @@ function configure_user_interface { mesh_client_startup_applications mesh_desktop_icons - # disable screen lock - chroot "$rootdir" dconf write /org/gnome/desktop/screensaver/lock-enabled false - # change the desktop background if [ $MESH_DESKTOP_BACKGROUND_IMAGE ]; then if [ -f $MESH_DESKTOP_BACKGROUND_IMAGE ]; then diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh index 7aebbb5d..8366f7e1 100755 --- a/src/freedombone-image-mesh +++ b/src/freedombone-image-mesh @@ -359,6 +359,10 @@ function disable_password_logins { sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config } +function disable_screen_lock { + dconf write /org/gnome/desktop/screensaver/lock-enabled false +} + if [ -f /root/.initial_mesh_setup ]; then if [ $1 ]; then MY_USERNAME=$1 @@ -381,6 +385,7 @@ if [ -f /root/.initial_mesh_setup ]; then configure_toxcore configure_zeronet disable_password_logins + disable_screen_lock rm /root/.initial_mesh_setup systemctl disable mesh-setup.service