vbox的更動 67054 路徑 trunk/src/VBox/Installer

時間撮記:

2017-5-24 上午08:36:39 (7 年 以前)

作者:

vboxsync

訊息:

bugref:8834: Makeself installers/Linux: indicate problems better in the exit codes
Detect failure to build kernel modules, to load kernel modules or to replace running kernel modules in the base Makeself installer.

檔案:

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

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

@@ -15 +15 @@
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
 #
+
+# Testing:
+# * After successful installation, 0 is returned if the vboxdrv module version
+#   built matches the one loaded.
+# * If the kernel modules cannot be built (run the installer with KERN_DIR=/) or
+#   loaded (run with KERN_DIR=/lib/modules/<installed non-current version>/build)
+#   then 1 is returned.
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
@@ -53 +60 @@
 VBOXUSB_GRP=$GROUPNAME
 
+## Were we able to stop any previously running Additions kernel modules?
+MODULES_STOPPED=1
+
 
 ##############################################################################
@@ -381 +391 @@
     fi
     "${INSTALLATION_DIR}/prerm-common.sh" >> "${LOG}"
+
+    # Now check whether the kernel modules were stopped.
+    lsmod | grep -q vboxdrv && MODULES_STOPPED=
+
     "${INSTALLATION_DIR}/postinst-common.sh" ${START_SERVICES} >> "${LOG}"
 
@@ -393 +407 @@
     info "We hope that you enjoy using VirtualBox."
     info ""
+
+    # And do a final test as to whether the kernel modules were properly created
+    # and loaded.  Return 0 if both are true, 1 if not.
+    test -n "${MODULES_STOPPED}" &&
+        modinfo vboxdrv >/dev/null 2>&1 &&
+        lsmod | grep -q vboxdrv ||
+        abort "The installation log file is at ${LOG}."
+
     log "Installation successful"
 elif [ "$ACTION" = "uninstall" ]; then