Changeset 8453 in vbox for trunk/src/VBox

Timestamp:

Apr 29, 2008 11:27:43 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30315

Message:

Installer/linux: fixes to the network scripts

Location:

trunk/src/VBox/Installer/linux

Files:

• VBoxAddIF.sh (modified) (7 diffs)
• vboxnet.sh.in (modified) (2 diffs)

trunk/src/VBox/Installer/linux/VBoxAddIF.sh

@@ -38 +38 @@
 appdel="VBoxDeleteIF"
 
+iffile=/etc/vbox/interfaces
+varfile=/var/run/VirtualBox/vboxnet
+
 echo "VirtualBox host networking interface creation utility, version _VERSION_"
 echo "(C) 2005-2007 Sun Microsystems, Inc."
@@ -100 +103 @@
 # Make sure that the configuration file is accessible and that the interface
 # is not already registered.
-if [ -f /etc/vbox/interfaces ]
+if [ -f "$iffile" ]
 then
   # Make sure that the configuration file is read and writable
-  if [ ! -r /etc/vbox/interfaces -o ! -w /etc/vbox/interfaces ]
+  if [ ! -r "$iffile" -o ! -w "$iffile" ]
   then
     echo 1>&2 ""
     echo 1>&2 "This utility must be able to read from and write to the file"
-    echo 1>&2 "/etc/vbox/interfaces.  Please make sure that you have enough permissions to"
+    echo 1>&2 "$iffile.  Please make sure that you have enough permissions to"
     echo 1>&2 "do this."
     exit 1
@@ -116 +119 @@
 oldbridge=""
 foundif=""
-tempfile=/etc/vbox/interfaces.tmp
+tempfile="$iffile.tmp"
 rm -f "$tempfile"
-if [ -f /etc/vbox/interfaces ]
+if [ -f "$iffile" ]
 then
   while read line
@@ -134 +137 @@
       then
         echo 1>&2 ""
-        echo 1>&2 "Removing badly formed line $line in /etc/vbox/interfaces."
+        echo 1>&2 "Removing badly formed line $line in $iffile."
       # If the interface to be created is already registered in the file, then
       # remove it and remember the fact
@@ -148 +151 @@
       fi
     fi # The line was not a comment
-  done < /etc/vbox/interfaces
+  done < "$iffile"
 else
-  # Create the file /etc/vbox/interfaces and add some explanations as comments
+  # Create the file $iffile and add some explanations as comments
   echo "# This file is for registering VirtualBox permanent host networking interfaces" > "$tempfile"
   echo "# and optionally adding them to network bridges on the host." >> "$tempfile"
@@ -156 +159 @@
   echo "" >> "$tempfile"
 fi
-mv -f "$tempfile" /etc/vbox/interfaces
+mv -f "$tempfile" "$iffile"
 
 # Add the new interface line to the file if so requested
 if [ "$appname" = "$appadd" ]
 then
-  echo "$interface" "$user" "$bridge" >> /etc/vbox/interfaces
+  echo "$interface" "$user" "$bridge" >> "$iffile"
   echo ""
   if [ -n "$group" ]; then
@@ -232 +235 @@
         echo 1>&2 "Make sure that the bridge exists and that you currently have sufficient"
         echo 1>&2 "permissions to do this."
+        echo $interface $user >> $varfile 2>/dev/null
         exit 1
       fi
     fi
+    # We may end up with duplicate entries here, but this does no great harm.
+    echo $interface $user $bridge >> $varfile 2>/dev/null
   fi # $appname = $appadd
 fi # VBoxTunctl -d succeeded

trunk/src/VBox/Installer/linux/vboxnet.sh.in

@@ -203 +203 @@
                 if [ -n "$3" ]; then
                   if brctl addif "$3" "$1" 2> /dev/null; then
-                    echo "$1 $2 $3" > "$VARFILE"
+                    echo "$1 $2 $3" >> "$VARFILE"
                   else
-                    echo "$1 $2" > "$VARFILE"
+                    echo "$1 $2" >> "$VARFILE"
                     echo "Warning - failed to add interface $1 to the bridge $3"
                   fi
                 else
-                  echo "$1 $2" > $VARFILE
+                  echo "$1 $2" >> "$VARFILE"
                 fi
                 i=20
@@ -279 +279 @@
           fi
         done < "$VARFILE"
-        failure "Removing of interface '$3' failed"
       fi
     done < "$VARFILE"