Changeset 6868 in vbox

Timestamp:

Feb 8, 2008 3:18:18 PM (17 years ago)

Author:

vboxsync

Message:

Implement associating a tap interface with a group (linux 2.6.23+)

Location:

trunk/src/VBox/Installer/linux

Files:

• VBoxAddIF.sh (modified) (4 diffs)
• vboxnet.sh (modified) (1 diff)

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

@@ -24 +24 @@
 interface=$1
 user=$2
+if [ "$user" = "-g" ]; then
+  shift;
+  group=$2
+  user=+$group
+fi
 bridge=$3
 
@@ -38 +43 @@
   then
     echo 1>&2 ""
-    echo 1>&2 "Usage: $appname <interface name> <user name> [<bridge name>]"
+    echo 1>&2 "Usage: $appname <interface name>"
+    echo 1>&2 "                [<user name>| -g <group name>] [<bridge name>]"
     echo 1>&2 "Create and register the permanent interface <interface name> for use by user"
-    echo 1>&2 "<user name> on the host system.  Optionally attach the interface to the network"
+    echo 1>&2 "<user name> (or group <group name> for linux kernels which support this)"
+    echo 1>&2 "on the host system.  Optionally attach the interface to the network"
     echo 1>&2 "bridge <bridge name>.  <interface name> should take the form vbox<0-99>."
   elif [ "$appname" = "$appdel" ]
@@ -174 +181 @@
   echo "$interface" "$user" "$bridge" >> /etc/vbox/interfaces
   echo ""
-  echo "Creating the permanent host networking interface \"$interface\" for user $user."
+  if [ -n "$group" ]; then
+      echo "Creating the permanent host networking interface \"$interface\" for group $group."
+  else
+      echo "Creating the permanent host networking interface \"$interface\" for user $user."
+  fi
 fi
 
@@ -199 +210 @@
   if [ "$appname" = "$appadd" ]
   then
-    if ! VBoxTunctl -t "$interface" -u "$user" > /dev/null 2>&1
-    then
-      echo 1>&2 ""
-      echo 1>&2 "Failed to create the interface \"$interface\" for user $user.  Please check"
-      echo 1>&2 "that you currently have sufficient permissions to do this."
-      exit 1
+    if [ -n "$group" ]; then
+      if ! VBoxTunctl -t "$interface" -g "$group" > /dev/null 2>&1
+      then
+        echo 1>&2 ""
+        echo 1>&2 "Failed to create the interface \"$interface\" for group $group.  Please check"
+        echo 1>&2 "that you currently have sufficient permissions to do this."
+        exit 1
+      fi
+    else
+      if ! VBoxTunctl -t "$interface" -u "$user" > /dev/null 2>&1
+      then
+        echo 1>&2 ""
+        echo 1>&2 "Failed to create the interface \"$interface\" for user $user.  Please check"
+        echo 1>&2 "that you currently have sufficient permissions to do this."
+        exit 1
+      fi
     fi
     # On SUSE Linux Enterprise Server, the tunctl command does not take

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

@@ -201 +201 @@
             (valid_ifname "$1"))
         then
+          case $user in
+            +*)
+                group=`echo $2 | cut -c2-`
+                cmd="VBoxTunctl -t $1 -g $group"
+                ;;
+            *)
+                cmd="VBoxTunctl -t $1 -u $2"
+                ;;
+          esac
           # Try to create the interface
-          if VBoxTunctl -t "$1" -u "$2" > /dev/null 2>&1
+          if $cmd > /dev/null 2>&1
           then
             # On SUSE Linux Enterprise Server, the interface does not