Browse Source

Fix config

Bob Mottram 8 years ago
parent
commit
d622f4d49f
2 changed files with 12 additions and 4 deletions
  1. 1
    0
      src/freedombone-image-customise
  2. 11
    4
      src/freedombone-image-mesh

+ 1
- 0
src/freedombone-image-customise View File

@@ -573,6 +573,7 @@ function mesh_client_startup_applications {
573 573
 
574 574
 	if [ ! -d $rootdir/home/$MY_USERNAME/.config/autostart ]; then
575 575
 		mkdir -p $rootdir/home/$MY_USERNAME/.config/autostart
576
+		chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
576 577
 	fi
577 578
 
578 579
 	START_DESKTOP=$rootdir/home/$MY_USERNAME/mesh-desktop.sh

+ 11
- 4
src/freedombone-image-mesh View File

@@ -185,7 +185,7 @@ function configure_zeronet_blog {
185 185
 
186 186
 	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
187 187
 		mkdir -p /home/${MY_USERNAME}/.config/zeronet
188
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
188
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
189 189
 	fi
190 190
 	echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myblog
191 191
 
@@ -263,7 +263,7 @@ function configure_zeronet_mail {
263 263
 
264 264
 	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
265 265
 		mkdir -p /home/${MY_USERNAME}/.config/zeronet
266
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
266
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
267 267
 	fi
268 268
 	echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/mymail
269 269
 
@@ -336,7 +336,7 @@ function configure_zeronet_forum {
336 336
 
337 337
 	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
338 338
 		mkdir -p /home/${MY_USERNAME}/.config/zeronet
339
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
339
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
340 340
 	fi
341 341
 	echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myforum
342 342
 
@@ -405,7 +405,7 @@ function configure_zeronet_id {
405 405
 
406 406
 	if [ ! -d /home/${MY_USERNAME}/.config/zeronet ]; then
407 407
 		mkdir -p /home/${MY_USERNAME}/.config/zeronet
408
-		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config/zeronet
408
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
409 409
 	fi
410 410
 	echo "$ZERONET_URL/$ZERONET_ID_ADDRESS" > /home/${MY_USERNAME}/.config/zeronet/myzeroid
411 411
 
@@ -510,6 +510,7 @@ function show_desktop_icons {
510 510
 	# set permissions
511 511
 	chmod +x /home/$MY_USERNAME/Desktop/*
512 512
 	chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/Desktop/*
513
+	chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
513 514
 	chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/tox
514 515
 	chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/zeronet
515 516
 	chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
@@ -681,6 +682,7 @@ function setup_amnesic_data {
681 682
 	if [ -d /media/${tomb_name} ]; then
682 683
 		if [ ! -d /home/${MY_USERNAME}/.config ]; then
683 684
 			mkdir -p /home/${MY_USERNAME}/.config
685
+			chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
684 686
 		fi
685 687
 		if [ -d /home/${MY_USERNAME}/.config/${tomb_name} ]; then
686 688
 			rm -rf /home/${MY_USERNAME}/.config/${tomb_name}
@@ -698,6 +700,7 @@ function setup_amnesic_data {
698 700
 	if [ -d /media/${tomb_name} ]; then
699 701
 		if [ ! -d /home/${MY_USERNAME}/.config ]; then
700 702
 			mkdir -p /home/${MY_USERNAME}/.config
703
+			chown ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
701 704
 		fi
702 705
 		if [ -d /home/${MY_USERNAME}/.config/zeronet ]; then
703 706
 			rm -rf /home/${MY_USERNAME}/.config/zeronet
@@ -765,6 +768,10 @@ if [ -f $MESH_INSTALL_SETUP ]; then
765 768
 
766 769
 	echo $'Beginning mesh node setup' >> $INSTALL_LOG
767 770
 
771
+	if [ -d /home/$MY_USERNAME/.config ]; then
772
+		chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config
773
+	fi
774
+
768 775
 	tomb slam all
769 776
 	enable_batman_daemon
770 777
 	create_ram_disk 1