瀏覽代碼

Remove previous tox tomb

Bob Mottram 9 年之前
父節點
當前提交
cd73ea5d74
共有 1 個檔案被更改,包括 9 行新增2 行删除
  1. 9
    2
      src/freedombone-image-mesh

+ 9
- 2
src/freedombone-image-mesh 查看文件

@@ -587,21 +587,28 @@ function setup_amnesic_tox_data {
587 587
 		return
588 588
 	fi
589 589
 
590
+	# close any existing open tomb
591
+	if [ -f /tmp/tox.tomb ]; then
592
+		tomb slam /tmp/tox.tomb
593
+	fi
594
+
595
+	# make a temporary password
590 596
 	TOMB_TOX_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
591 597
 	tomb dig -s $TOMB_TOX_SIZE_MB /tmp/tox.tomb
592 598
 	tomb forge /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
593 599
 	tomb lock /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
594 600
 	tomb open /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
601
+	# clear the password
595 602
 	TOMB_TOX_PASSWORD=
603
+
596 604
 	if [ -d /media/tox ]; then
597 605
 		if [ ! -d /home/$MY_USERNAME/.config ]; then
598 606
 			mkdir -p /home/$MY_USERNAME/.config
599 607
 		fi
600 608
 		if [ -d /home/$MY_USERNAME/.config/tox ]; then
601
-			cp -r /home/$MY_USERNAME/.config/tox/* /media/tox
602 609
 			rm -rf /home/$MY_USERNAME/.config/tox
603
-			ln -s /media/tox /home/$MY_USERNAME/.config/tox
604 610
 		fi
611
+		ln -s /media/tox /home/$MY_USERNAME/.config/tox
605 612
 		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
606 613
 		chown -R $MY_USERNAME:$MY_USERNAME /media/tox
607 614
 		echo "Tox Tomb created" >> /var/log/${PROJECT_NAME}.log