Turns out that you need to actually kill ZT first. Also turns out that it should probably run before dropbear. Who knew.

This commit is contained in:
kay
2020-08-06 20:03:44 -07:00
parent f59b93e368
commit f86a08909f
2 changed files with 6 additions and 5 deletions

View File

@@ -3,7 +3,7 @@
# copy script into initramfs-tools dirs # copy script into initramfs-tools dirs
echo "Copying files" echo "Copying files"
cp hooks.zerotier.sh /usr/share/initramfs-tools/hooks/zerotier cp hooks.zerotier.sh /usr/share/initramfs-tools/hooks/zerotier
cp scripts.init-bottom.zerotier.sh /usr/share/initramfs-tools/scripts/init-bottom/zerotier cp scripts.init-bottom.zerotier.sh /usr/share/initramfs-tools/scripts/init-bottom/0zerotier
cp scripts.init-premount.0zerotier.sh /usr/share/initramfs-tools/scripts/init-premount/0zerotier cp scripts.init-premount.0zerotier.sh /usr/share/initramfs-tools/scripts/init-premount/0zerotier
# update initramfs to now include our scripts # update initramfs to now include our scripts

View File

@@ -24,6 +24,11 @@ if [ ! -f ${ZT_APP} ]; then
exit 0 exit 0
fi fi
log_msg_begin "Stopping ZeroTier"
kill -TERM $(cat /run/zerotier-one.pid)
sleep 1
log_end_msg
log_msg_begin "Removing loopback device" log_msg_begin "Removing loopback device"
# shutdown lo # shutdown lo
ifconfig lo down ifconfig lo down
@@ -32,8 +37,4 @@ log_end_msg
log_msg_begin "Removing tun device" log_msg_begin "Removing tun device"
# remove created tun device # remove created tun device
rm /dev/net/tun rm /dev/net/tun
log_end_msg
log_msg_begin "Stopping ZeroTier"
kill -TERM $(cat /run/zerotier-one.pid)
log_end_msg log_end_msg