arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Integrate fixes from @ehlers

Browse Source
This commit is contained in:
Julien Duponchelle 2016-06-06 18:27:49 +02:00
parent e335015520
commit 775ee4259e
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gns3server/modules/docker/resources/init.sh
View File

@ -24,20 +24,15 @@ PATH=/gns3/bin:/tmp/gns3/bin
# 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 /gns3/bin/busybox --install -s /tmp/gns3/bin
fi fi
# Restore file permission and mount volumes # Restore file permission and mount volumes
for i in $(echo "$GNS3_VOLUMES" | tr ":" "\n") echo "$GNS3_VOLUMES" | tr ":" "\n" | while read i
do do
# Copy original files if destination is empty (first start) # Copy original files if destination is empty (first start)
if ! [ "$(ls -A /gns3volumes$i)" ]; then [ "$(ls -A "/gns3volumes$i")" ] || cp -a "$i/." "/gns3volumes$i"
for file in $(ls -A "$i")
do
cp -a "$i/$file" "/gns3volumes$i/$file"
done
fi
mount --bind "/gns3volumes$i" "$i" mount --bind "/gns3volumes$i" "$i"
if [ -f "$i/.gns3_perms" ] if [ -f "$i/.gns3_perms" ]
@ -53,28 +48,28 @@ done
# /etc/hosts # /etc/hosts
[ -s /etc/hosts ] || cat > /etc/hosts << __EOF__ [ -s /etc/hosts ] || cat > /etc/hosts << __EOF__
127.0.1.1 $HOSTNAME 127.0.1.1 $HOSTNAME
127.0.0.1 localhost 127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback ::1 localhost ip6-localhost ip6-loopback
fe00::0 ip6-localnet fe00::0 ip6-localnet
ff00::0 ip6-mcastprefix ff00::0 ip6-mcastprefix
ff02::1 ip6-allnodes ff02::1 ip6-allnodes
ff02::2 ip6-allrouters ff02::2 ip6-allrouters
__EOF__ __EOF__
# configure loopback interface # configure loopback interface
ip link set dev lo up ip link set dev lo up
# Wait for all eth available # Wait for all eth available
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 sleep 0.5
done done
# activate eth interfaces # activate eth interfaces
sed -n 's/^ *\(eth[0-9]*\):.*/\1/p' < /proc/net/dev | while read dev; do sed -n 's/^ *\(eth[0-9]*\):.*/\1/p' < /proc/net/dev | while read dev; do
ip link set dev $dev up ip link set dev $dev up
done done
# configure network interfaces # configure network interfaces