diff options
| author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2021-10-31 15:09:14 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-11-05 22:56:47 +0700 |
| commit | e8f0d7f02aab9fa4a8c4f3b9012189be5468e323 (patch) | |
| tree | 92395f314093bcfe5dbd549822edeccc3a6abfc7 /system | |
| parent | 3a236b7600f3f8115de95c3a86d078a610070480 (diff) | |
| download | slackbuilds-e8f0d7f02aab9fa4a8c4f3b9012189be5468e323.tar.xz | |
system/virtualbox: Fix kernel module detection on 'rc.vboxdrv start'
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/virtualbox/vboxdrv.sh-setup.diff | 25 | ||||
| -rw-r--r-- | system/virtualbox/virtualbox.SlackBuild | 2 |
2 files changed, 13 insertions, 14 deletions
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff index 76c0d580c0a8..b73771ebafe8 100644 --- a/system/virtualbox/vboxdrv.sh-setup.diff +++ b/system/virtualbox/vboxdrv.sh-setup.diff @@ -1,6 +1,5 @@ -diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox-6.1.26/src/VBox/Installer/linux/vboxdrv.sh ---- VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh 2021-07-28 18:24:14.000000000 +0200 -+++ VirtualBox-6.1.26/src/VBox/Installer/linux/vboxdrv.sh 2021-08-20 14:10:47.151000000 +0200 +--- vboxdrv.sh.orig 2021-10-18 19:58:10.000000000 +0200 ++++ vboxdrv.sh 2021-10-30 20:36:29.483575169 +0200 @@ -61,23 +61,8 @@ export USERNAME export USER=$USERNAME @@ -25,7 +24,7 @@ diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox if test -u "${VIRTUALBOX}"; then GROUP=root DEVICE_MODE=0600 -@@ -148,131 +133,6 @@ +@@ -148,131 +133,12 @@ echo "${1}" >> "${LOG}" } @@ -37,12 +36,12 @@ diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox - >> "${LOG}" -} - --# Detect VirtualBox version info or report error. --VBOX_VERSION="`"$VBOXMANAGE" -v | cut -d r -f1`" --[ -n "$VBOX_VERSION" ] || failure 'Cannot detect VirtualBox version number' --VBOX_REVISION="r`"$VBOXMANAGE" -v | cut -d r -f2`" --[ "$VBOX_REVISION" != "r" ] || failure 'Cannot detect VirtualBox revision number' -- + # Detect VirtualBox version info or report error. + VBOX_VERSION="`"$VBOXMANAGE" -v | cut -d r -f1`" + [ -n "$VBOX_VERSION" ] || failure 'Cannot detect VirtualBox version number' + VBOX_REVISION="r`"$VBOXMANAGE" -v | cut -d r -f2`" + [ "$VBOX_REVISION" != "r" ] || failure 'Cannot detect VirtualBox revision number' + -## Output the vboxdrv part of our udev rule. This is redirected to the right file. -udev_write_vboxdrv() { - VBOXDRV_GRP="$1" @@ -157,7 +156,7 @@ diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox # Returns path to module file as seen by modinfo(8) or empty string. module_path() { -@@ -415,8 +275,6 @@ +@@ -415,8 +281,6 @@ mkdir -p -m 0750 /dev/vboxusb 2>/dev/null chown root:vboxusers /dev/vboxusb 2>/dev/null fi @@ -166,7 +165,7 @@ diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox succ_msg "VirtualBox services started" } -@@ -497,102 +355,10 @@ +@@ -497,102 +361,10 @@ fi } @@ -270,7 +269,7 @@ diff -Naur VirtualBox-6.1.26.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox } dmnstatus() -@@ -642,20 +408,7 @@ +@@ -642,20 +414,7 @@ stop && start ;; setup) diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index bc9c56e385cd..8f0b8819ecb5 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=virtualbox SRCNAM=VirtualBox VERSION=${VERSION:-6.1.28} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} |