ソースを参照

dconf settings in autostart

Bob Mottram 8 年 前
コミット
184ccae59e
共有2 個のファイルを変更した14 個の追加22 個の削除を含む
  1. 14
    0
      src/freedombone-image-customise
  2. 0
    22
      src/freedombone-image-mesh

+ 14
- 0
src/freedombone-image-customise ファイルの表示

@@ -575,6 +575,20 @@ function mesh_client_startup_applications {
575 575
 		mkdir -p $rootdir/home/$MY_USERNAME/.config/autostart
576 576
 	fi
577 577
 
578
+	START_DESKTOP=$rootdir/home/$MY_USERNAME/.config/autostart/mesh-desktop
579
+	echo '#!/bin/bash' > $START_DESKTOP
580
+	echo 'PID=$(pgrep mate-session)' >> $START_DESKTOP
581
+	echo 'export DBUS_SESSION_BUS_ADDRESS=$(grep -z DBUS_SESSION_BUS_ADDRESS /proc/$PID/environ|cut -d= -f2-)' >> $START_DESKTOP
582
+	echo 'gsettings set org.mate.caja.desktop volumes-visible false' >> $START_DESKTOP
583
+	echo 'dconf write /org/mate/caja/desktop/computer-icon-visible false' >> $START_DESKTOP
584
+	echo 'dconf write /org/mate/caja/desktop/home-icon-visible false' >> $START_DESKTOP
585
+	echo 'dconf write /org/mate/caja/desktop/network-icon-visible false' >> $START_DESKTOP
586
+	echo 'dconf write /org/mate/caja/desktop/trash-icon-visible false' >> $START_DESKTOP
587
+	echo 'dconf write /org/mate/caja/desktop/volumes-visible false' >> $START_DESKTOP
588
+	echo 'dconf write /org/mate/desktop/media-handling/automount-open false' >> $START_DESKTOP
589
+	echo 'dconf write /org/mate/desktop/screensaver/lock-enabled false' >> $START_DESKTOP
590
+	chmod +x $START_DESKTOP
591
+
578 592
 	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
579 593
 }
580 594
 

+ 0
- 22
src/freedombone-image-mesh ファイルの表示

@@ -531,10 +531,6 @@ function disable_password_logins {
531 531
 	sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' /etc/ssh/sshd_config
532 532
 }
533 533
 
534
-function disable_screen_lock {
535
-	dconf write /org/gnome/desktop/screensaver/lock-enabled false
536
-}
537
-
538 534
 function enable_batman_daemon {
539 535
 	systemctl enable batman
540 536
 	systemctl daemon-reload
@@ -610,8 +606,6 @@ function create_tomb {
610 606
 	tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
611 607
 	tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
612 608
 	tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
613
-	gsettings set org.mate.caja.desktop volumes-visible false
614
-
615 609
 	# stop stuff from popping up
616 610
 	pkill caja
617 611
 
@@ -726,20 +720,6 @@ function setup_amnesic_data {
726 720
 	fi
727 721
 }
728 722
 
729
-function setup_dconf {
730
-	if [ -d /home/${MY_USERNAME}/Desktop ]; then
731
-		PID=$(pgrep gnome-session)
732
-		export DBUS_SESSION_BUS_ADDRESS=$(grep -z DBUS_SESSION_BUS_ADDRESS /proc/$PID/environ|cut -d= -f2-)
733
-
734
-		dconf write /org/mate/caja/desktop/computer-icon-visible false
735
-		dconf write /org/mate/caja/desktop/home-icon-visible false
736
-		dconf write /org/mate/caja/desktop/network-icon-visible false
737
-		dconf write /org/mate/caja/desktop/trash-icon-visible false
738
-		dconf write /org/mate/caja/desktop/volumes-visible false
739
-		dconf write /org/mate/desktop/media-handling/automount-open false
740
-	fi
741
-}
742
-
743 723
 # whether to reset the identity
744 724
 set_new_identity=
745 725
 if [ $2 ]; then
@@ -777,7 +757,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
777 757
 
778 758
 	echo $'Beginning mesh node setup' >> $INSTALL_LOG
779 759
 
780
-	setup_dconf
781 760
 	tomb slam all
782 761
 	enable_batman_daemon
783 762
 	create_ram_disk 1
@@ -792,7 +771,6 @@ if [ -f $MESH_INSTALL_SETUP ]; then
792 771
 	create_tox_user
793 772
 	configure_zeronet
794 773
 	disable_password_logins
795
-	disable_screen_lock
796 774
 	mesh_amnesic
797 775
 
798 776
 	if [ ! -f $MESH_AMNESIC ]; then