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
 
573
 
574
 	if [ ! -d $rootdir/home/$MY_USERNAME/.config/autostart ]; then
574
 	if [ ! -d $rootdir/home/$MY_USERNAME/.config/autostart ]; then
575
 		mkdir -p $rootdir/home/$MY_USERNAME/.config/autostart
575
 		mkdir -p $rootdir/home/$MY_USERNAME/.config/autostart
576
+		chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
576
 	fi
577
 	fi
577
 
578
 
578
 	START_DESKTOP=$rootdir/home/$MY_USERNAME/mesh-desktop.sh
579
 	START_DESKTOP=$rootdir/home/$MY_USERNAME/mesh-desktop.sh

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

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