Merge remote-tracking branch 'origin/2.2' into 2.2

This commit is contained in:
grossmj 2024-10-14 17:48:42 +10:00
commit cb46c0fbcc
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD

View File

@ -25,7 +25,10 @@ PATH=/gns3/bin:/tmp/gns3/bin:/sbin:$PATH
# bootstrap busybox commands # bootstrap busybox commands
if [ ! -d /tmp/gns3/bin ]; then if [ ! -d /tmp/gns3/bin ]; then
busybox mkdir -p /tmp/gns3/bin busybox mkdir -p /tmp/gns3/bin
/gns3/bin/busybox --install -s /tmp/gns3/bin for applet in `busybox --list-full`
do
ln -s /gns3/bin/busybox "/tmp/gns3/bin/$applet"
done
fi fi
# Restore file permission and mount volumes # Restore file permission and mount volumes
@ -75,7 +78,7 @@ ip link set dev lo up
while true while true
do do
grep $GNS3_MAX_ETHERNET /proc/net/dev > /dev/null && break grep $GNS3_MAX_ETHERNET /proc/net/dev > /dev/null && break
sleep 0.5 usleep 500000 # wait 0.5 seconds
done done
# activate eth interfaces # activate eth interfaces