Move dconf command to mesh startup script

This commit is contained in:
Bob Mottram 2016-06-25 11:01:58 +01:00
parent 91c3974c6a
commit e89f9bc5f5
2 changed files with 5 additions and 3 deletions

View File

@ -1153,9 +1153,6 @@ function configure_user_interface {
mesh_client_startup_applications mesh_client_startup_applications
mesh_desktop_icons mesh_desktop_icons
# disable screen lock
chroot "$rootdir" dconf write /org/gnome/desktop/screensaver/lock-enabled false
# change the desktop background # change the desktop background
if [ $MESH_DESKTOP_BACKGROUND_IMAGE ]; then if [ $MESH_DESKTOP_BACKGROUND_IMAGE ]; then
if [ -f $MESH_DESKTOP_BACKGROUND_IMAGE ]; then if [ -f $MESH_DESKTOP_BACKGROUND_IMAGE ]; then

View File

@ -359,6 +359,10 @@ function disable_password_logins {
sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config 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 [ -f /root/.initial_mesh_setup ]; then
if [ $1 ]; then if [ $1 ]; then
MY_USERNAME=$1 MY_USERNAME=$1
@ -381,6 +385,7 @@ if [ -f /root/.initial_mesh_setup ]; then
configure_toxcore configure_toxcore
configure_zeronet configure_zeronet
disable_password_logins disable_password_logins
disable_screen_lock
rm /root/.initial_mesh_setup rm /root/.initial_mesh_setup
systemctl disable mesh-setup.service systemctl disable mesh-setup.service