vbox的更動 61199 路徑 trunk/src/VBox/Additions

時間撮記:

2016-5-25 下午05:51:35 (8 年 以前)

作者:

vboxsync

訊息:

bugref:8062: Linux installers: drop DKMS support: on Additions installation and service start-up, build modules for all kernels found on the system; and hook into the kernel package update notification which at least Debian and Redhat-based systems provide to build new packages as soon as a new kernel is installed.

檔案:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (修改) (9 筆差異)

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

@@ -29 +29 @@
 ### END INIT INFO
 
+## @todo This file duplicates a lot of script with vboxdrv.sh.  When making
+# changes please try to reduce differences between the two wherever possible.
+
 PATH=$PATH:/bin:/sbin:/usr/sbin
 PACKAGE=VBoxGuestAdditions
@@ -35 +38 @@
 OLDMODULES="vboxguest vboxadd vboxsf vboxvfs vboxvideo"
 SCRIPTNAME=vboxadd.sh
+QUICKSETUP=
 
 if $MODPROBE -c 2>/dev/null | grep -q '^allow_unsupported_modules  *0'; then
@@ -166 +170 @@
 {
     begin "Starting the VirtualBox Guest Additions" console;
+    # If we got this far assume that the slow set-up has been done.
+    QUICKSETUP=yes
     if test -r $config; then
       . $config
@@ -300 +306 @@
 {
     # don't stop the old modules here -- they might be in use
-    cleanup_modules
+    test -z "${QUICKSETUP}" && cleanup_modules
     begin "Building the VirtualBox Guest Additions kernel modules"
 
     begin "Building the main Guest Additions module"
-    if ! $BUILDINTMP \
-        --save-module-symvers /tmp/vboxguest-Module.symvers \
-        --module-source $MODULE_SRC/vboxguest \
-        --no-print-directory install >> $LOG 2>&1; then
-        show_error "Look at $LOG to find out what went wrong"
-        return 1
-    fi
-    succ_msg
-    begin "Building the shared folder support module"
-    if ! $BUILDINTMP \
-        --use-module-symvers /tmp/vboxguest-Module.symvers \
-        --module-source $MODULE_SRC/vboxsf \
-        --no-print-directory install >> $LOG 2>&1; then
-        show_error  "Look at $LOG to find out what went wrong"
-        return 1
-    fi
-    succ_msg
-    begin "Building the graphics driver module"
-    if ! $BUILDINTMP \
-        --use-module-symvers /tmp/vboxguest-Module.symvers \
-        --module-source $MODULE_SRC/vboxvideo \
-        --no-print-directory install >> $LOG 2>&1; then
-        show_error "Look at $LOG to find out what went wrong"
-    fi
-    succ_msg
-    depmod
+    for i in /lib/modules/*; do
+        test -d "${i}/build" || continue
+        # This does not work for 2.4 series kernels.  How sad.
+        test -n "${QUICKSETUP}" && test -f "${i}/misc/vboxguest.ko" && continue
+        begin "Building for kernel ${i##*/}" console
+        export KERN_DIR="${i}/build"
+        export MODULE_DIR="${i}/misc"
+        if ! $BUILDINTMP \
+            --save-module-symvers /tmp/vboxguest-Module.symvers \
+            --module-source $MODULE_SRC/vboxguest \
+            --no-print-directory install >> $LOG 2>&1; then
+            show_error "Look at $LOG to find out what went wrong"
+            test "${i##*/}" = "`uname -r`" && return 1
+        fi
+        succ_msg
+        begin "Building the shared folder support module"
+        if ! $BUILDINTMP \
+            --use-module-symvers /tmp/vboxguest-Module.symvers \
+            --module-source $MODULE_SRC/vboxsf \
+            --no-print-directory install >> $LOG 2>&1; then
+            show_error  "Look at $LOG to find out what went wrong"
+            test "${i##*/}" = "`uname -r`" && return 1
+        fi
+        succ_msg
+        begin "Building the graphics driver module"
+        if ! $BUILDINTMP \
+            --use-module-symvers /tmp/vboxguest-Module.symvers \
+            --module-source $MODULE_SRC/vboxvideo \
+            --no-print-directory install >> $LOG 2>&1; then
+            show_error "Look at $LOG to find out what went wrong"
+        fi
+        succ_msg
+        depmod "${i##*/}"
+    done
     return 0
 }
@@ -381 +395 @@
     ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
     ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11
+    # And a post-installation script for rebuilding modules when a new kernel
+    # is installed.
+    mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
+    cat << EOF > /etc/kernel/postinst.d/vboxadd
+#!/bin/sh
+/sbin/rcvboxadd quicksetup
+exit 0
+EOF
+    cat << EOF > /etc/kernel/prerm.d/vboxadd
+#!/bin/sh
+for i in ${OLDMODULES}; do rm -f /lib/modules/"\${1}"/misc/"\${i}".ko; done
+rmdir -p /lib/modules/"\$1"/misc 2>/dev/null
+exit 0
+EOF
+    chmod 0755 /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
     # At least Fedora 11 and Fedora 12 require the correct security context when
     # executing this command from service scripts. Shouldn't hurt for other
@@ -424 +453 @@
         show_error "Please check that you have gcc, make, the header files for your Linux kernel and possibly perl installed."
     fi
-    extra_setup
+    test -z "${QUICKSETUP}" && extra_setup
     if [ "$mod_succ" -eq "0" ]; then
         if running_vboxguest || running_vboxadd; then
@@ -460 +489 @@
     rm /sbin/rcvboxadd 2>/dev/null
     rm /sbin/rcvboxadd-x11 2>/dev/null
+    rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+    rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null
     rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
 }
@@ -485 +516 @@
     setup && start
     ;;
+quicksetup)
+    QUICKSETUP=yes
+    setup && start
+    ;;
 cleanup)
     cleanup
@@ -492 +527 @@
     ;;
 *)
-    echo "Usage: $0 {start|stop|restart|status|setup}"
+    echo "Usage: $0 {start|stop|restart|status|setup|quicksetup|cleanup}"
     exit 1
 esac