Kill Caja popup

This commit is contained in:
Bob Mottram 2016-07-28 13:25:26 +01:00
parent dc2947f7c5
commit 37d26d582c
1 changed files with 6 additions and 0 deletions

View File

@ -85,6 +85,7 @@ function change_avahi_name {
sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf sed -i "s|#host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf sed -i "s|host-name=.*|host-name=P$PEER_ID|g" /etc/avahi/avahi-daemon.conf
set_hostname P$PEER_ID set_hostname P$PEER_ID
systemctl restart avahi-daemon
echo "New avahi name for this peer is P$PEER_ID" echo "New avahi name for this peer is P$PEER_ID"
toilet "mesh-$PEER_ID" toilet "mesh-$PEER_ID"
@ -676,8 +677,13 @@ if [ -f $MESH_INSTALL_SETUP ]; then
if [ ! -f $MESH_AMNESIC ]; then if [ ! -f $MESH_AMNESIC ]; then
rm $MESH_INSTALL_SETUP rm $MESH_INSTALL_SETUP
systemctl disable mesh-setup.service systemctl disable mesh-setup.service
else
# kill the MATE file manager which pops up when
# encrypted drives are mounted
pkill caja
fi fi
mesh_restart_daemons mesh_restart_daemons
if [ ! -f $MESH_INSTALL_COMPLETED ]; then if [ ! -f $MESH_INSTALL_COMPLETED ]; then
echo $'Mesh node setup complete' >> $INSTALL_LOG echo $'Mesh node setup complete' >> $INSTALL_LOG