1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-13 20:08:55 +00:00

Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle 2016-06-07 10:56:55 +02:00
commit d30abeca21
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8

View File

@ -29,15 +29,10 @@ if [ ! -d /tmp/gns3/bin ]; then
fi
# Restore file permission and mount volumes
for i in $(echo "$GNS3_VOLUMES" | tr ":" "\n")
echo "$GNS3_VOLUMES" | tr ":" "\n" | while read i
do
# Copy original files if destination is empty (first start)
if ! [ "$(ls -A /gns3volumes$i)" ]; then
for file in $(ls -A "$i")
do
cp -a "$i/$file" "/gns3volumes$i/$file"
done
fi
[ "$(ls -A "/gns3volumes$i")" ] || cp -a "$i/." "/gns3volumes$i"
mount --bind "/gns3volumes$i" "$i"
if [ -f "$i/.gns3_perms" ]