浏览代码

Kill Caja popup

Bob Mottram 8 年前
父节点
当前提交
37d26d582c
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6
    0
      src/freedombone-image-mesh

+ 6
- 0
src/freedombone-image-mesh 查看文件

85
 	sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
85
 	sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
86
 	sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
86
 	sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
87
 	set_hostname P$PEER_ID
87
 	set_hostname P$PEER_ID
88
+	systemctl restart avahi-daemon
88
 
89
 
89
 	echo "New avahi name for this peer is P$PEER_ID"
90
 	echo "New avahi name for this peer is P$PEER_ID"
90
 	toilet "mesh-$PEER_ID"
91
 	toilet "mesh-$PEER_ID"
676
 	if [ ! -f $MESH_AMNESIC ]; then
677
 	if [ ! -f $MESH_AMNESIC ]; then
677
 		rm $MESH_INSTALL_SETUP
678
 		rm $MESH_INSTALL_SETUP
678
 		systemctl disable mesh-setup.service
679
 		systemctl disable mesh-setup.service
680
+	else
681
+		# kill the MATE file manager which pops up when
682
+		# encrypted drives are mounted
683
+		pkill caja
679
 	fi
684
 	fi
680
 
685
 
686
+
681
 	mesh_restart_daemons
687
 	mesh_restart_daemons
682
 	if [ ! -f $MESH_INSTALL_COMPLETED ]; then
688
 	if [ ! -f $MESH_INSTALL_COMPLETED ]; then
683
 		echo $'Mesh node setup complete' >> $INSTALL_LOG
689
 		echo $'Mesh node setup complete' >> $INSTALL_LOG