儲存庫 vbox 的更動 62730

時間撮記:

2016-7-30 上午09:07:54 (8 年 以前)

作者:

vboxsync

訊息:

bugref:3809: Linux installer maintenance: remove the work-around support for versions of udev earlier than 60 (more than ten years ago) in the host installers.

檔案:

• trunk/src/VBox/Installer/linux/vboxdrv.sh (修改) (2 筆差異)

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

@@ -142 +142 @@
     USB_GROUP="$4"        # The group that has permission to access USB devices
     NO_INSTALL="$5"       # Set this to "1" to remove but not re-install rules
-    UDEV_STRING="$6"      # The output of the udev version command
 
     # Extra space!
     case "$USB_GROUP" in ?*) USB_GROUP=" $USB_GROUP" ;; esac
-    case "$NO_INSTALL" in
-    "1") ;;
-    *)
-        udev_ver=`expr "$UDEV_STRING" : '[^0-9]*\([0-9]*\)'`
-        udev_fix=""
-        test "$udev_ver" = "" -o "$udev_ver" -lt 55 &&
-            udev_fix="1"
-        udev_do_usb=""
-        test "$udev_ver" -ge 59 &&
-            udev_do_usb="1"
-        case "$udev_fix" in
-        "1")
-            udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE" |
-                sed 's/\([^+=]*\)[+=]*\([^"]*"[^"]*"\)/\1=\2/g'
-            ;;
-        *)
-            udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE"
-            case "$udev_do_usb" in "1")
-                udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP" ;;
-            esac
-            ;;
-        esac
-        ;;
-    esac
+    case "$NO_INSTALL" in "1") return ;; esac
+    udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE"
+    udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP"
 }
 
@@ -182 +160 @@
 
     if test -d /etc/udev/rules.d; then
-        udev_out="`udevadm version 2>/dev/null ||  udevinfo -V 2>/dev/null`"
         generate_udev_rule "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \
-                           "$USB_GROUP" "$NO_INSTALL" "$udev_out"
+                           "$USB_GROUP" "$NO_INSTALL"
     fi
     # Remove old udev description file