Changeset 62844 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Aug 1, 2016 6:11:12 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: try disabling the initramfs support again, as my feeling is that it is only needed on old (Upstart-based?) distributions where the user-space fall-back driver works anyway. I would like to take a closer look at what is going wrong to perhaps find a less invasive solution. This will involve quite a bit of testing.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (5 diffs)

trunk/src/VBox/Additions/linux/installer/vboxadd.sh

@@ -39 +39 @@
 SCRIPTNAME=vboxadd.sh
 QUICKSETUP=
-
-# These are getting hard-coded in more and more places...
-test -z "${KERN_DIR}" && KERN_DIR="/lib/modules/`uname -r`/build"
-test -z "${MODULE_DIR}" && MODULE_DIR="/lib/modules/`uname -r`/misc"
-KERN_DIR_SUFFIX="${KERN_DIR#/lib/modules/}"
-KERN_VER="${KERN_DIR_SUFFIX%/*}"
 
 if $MODPROBE -c 2>/dev/null | grep -q '^allow_unsupported_modules  *0'; then
@@ -281 +275 @@
 }
 
-## Update the initramfs.  Debian and Ubuntu put the graphics driver in, and
-# need the touch(1) command below.  Everyone else that I checked just need
-# the right module alias file from depmod(1) and only use the initramfs to
-# load the root filesystem, not the boot splash.  update-initramfs works
-# for the first two and dracut for every one else I checked.  We are only
-# interested in distributions recent enough to use the KMS vboxvideo driver.
-## @param $1  kernel version to update for.
-update_module_dependencies()
-{
-    depmod "${1}"
-    rm -f "/lib/modules/${1}/initrd/vboxvideo"
-    test -d "/lib/modules/${1}/initrd" &&
-        test -f "/lib/modules/${1}/misc/vboxvideo.ko" &&
-        touch "/lib/modules/${1}/initrd/vboxvideo"
-    test -n "${QUICKSETUP}" && return
-    if type dracut >/dev/null 2>&1; then
-        dracut -f "/boot/initramfs-${1}.img" "${1}"
-    elif type update-initramfs >/dev/null 2>&1; then
-        update-initramfs -u -k "${1}"
-    fi
-}
-
 # Remove any existing VirtualBox guest kernel modules from the disk, but not
 # from the kernel as they may still be in use
@@ -356 +328 @@
     fi
     succ_msg
-    update_module_dependencies "${KERN_VER}"
+    depmod
     return 0
 }
@@ -485 +457 @@
     # Delete old versions of VBox modules.
     cleanup_modules
-    for i in /lib/modules/*; do
-        update_module_dependencies "${i#/lib/modules/}"
-    done
+    depmod
 
     # Remove old module sources
@@ -504 +474 @@
     rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
     rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
-    rm -f /lib/modules/*/initrd/vboxvideo
 }