Browse Source

tox bootstrap order

Bob Mottram 9 years ago
parent
commit
95fbf0f84a
1 changed files with 26 additions and 19 deletions
  1. 26
    19
      src/freedombone-image-mesh

+ 26
- 19
src/freedombone-image-mesh View File

592
 		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
592
 		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
593
 	fi
593
 	fi
594
 
594
 
595
+	tomb_name=tox-bootstrapd
596
+	if [ -f /etc/systemd/system/${tomb_name}.service ]; then
597
+		systemctl stop ${tomb_name}
598
+	fi
599
+	create_tomb ${tomb_name} $TOMB_TOX_BOOTSTRAP_SIZE_MB
600
+	if [ -d /media/${tomb_name} ]; then
601
+		if [ -d /var/lib/tox-bootstrapd ]; then
602
+			if [ ! -d /var/lib/tox-bootstrapd_base ]; then
603
+				mv /var/lib/tox-bootstrapd /var/lib/tox-bootstrapd_base
604
+			fi
605
+		fi
606
+		if [ -d /var/lib/tox-bootstrapd ]; then
607
+			shred -zu /var/lib/tox-bootstrapd/*
608
+			rm -rf /var/lib/tox-bootstrapd
609
+		fi
610
+		ln -s /media/${tomb_name} /var/lib/tox-bootstrapd
611
+		if [ -d /var/lib/tox-bootstrapd_base ]; then
612
+			cp -rp /var/lib/tox-bootstrapd_base/* /media/${tomb_name}
613
+		fi
614
+		echo "${tomb_name} tomb created" >> $INSTALL_LOG
615
+	else
616
+		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
617
+	fi
618
+
595
 	tomb_name=tox
619
 	tomb_name=tox
596
 	create_tomb ${tomb_name} $TOMB_TOX_SIZE_MB
620
 	create_tomb ${tomb_name} $TOMB_TOX_SIZE_MB
597
 	if [ -d /media/${tomb_name} ]; then
621
 	if [ -d /media/${tomb_name} ]; then
615
 		if [ ! -d /home/${MY_USERNAME}/.config ]; then
639
 		if [ ! -d /home/${MY_USERNAME}/.config ]; then
616
 			mkdir -p /home/${MY_USERNAME}/.config
640
 			mkdir -p /home/${MY_USERNAME}/.config
617
 		fi
641
 		fi
618
-		if [ -d /home/${MY_USERNAME}/.config/${tomb_name} ]; then
619
-			rm -rf /home/${MY_USERNAME}/.config/${tomb_name}
642
+		if [ -d /home/${MY_USERNAME}/.config/zeronet ]; then
643
+			rm -rf /home/${MY_USERNAME}/.config/zeronet
620
 		fi
644
 		fi
621
 		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/zeronet
645
 		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/zeronet
622
 		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
646
 		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
642
 	else
666
 	else
643
 		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
667
 		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
644
 	fi
668
 	fi
645
-
646
-	tomb_name=tox-bootstrapd
647
-	create_tomb ${tomb_name} $TOMB_TOX_BOOTSTRAP_SIZE_MB
648
-	if [ -d /media/${tomb_name} ]; then
649
-		if [ -d /var/lib/tox-bootstrapd ]; then
650
-			if [ ! -d /var/lib/tox-bootstrapd_base ]; then
651
-				mv /var/lib/tox-bootstrapd /var/lib/tox-bootstrapd_base
652
-			fi
653
-		fi
654
-		ln -s /media/${tomb_name} /var/lib/tox-bootstrapd
655
-		if [ -d /var/lib/tox-bootstrapd_base ]; then
656
-			cp -rp /var/lib/tox-bootstrapd_base/* /media/${tomb_name}
657
-		fi
658
-		echo "${tomb_name} tomb created" >> $INSTALL_LOG
659
-	else
660
-		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
661
-	fi
662
 }
669
 }
663
 
670
 
664
 # whether to reset the identity
671
 # whether to reset the identity