Changeset 66423 in vbox for trunk/src/VBox/Additions/linux/installer/vboxadd.sh

Timestamp:

Apr 4, 2017 7:57:09 PM (8 years ago)

Author:

vboxsync

Message:

bugref:7498: create guest additions in rpm format for Oracle Linux
Re-arrange the vboxadd.sh/rcvboxadd script to make it easier for the kernel module rpm package to run the kernel parts (essentially, vboxadd.sh udev) and the non-kernel part to do the rest, by setting INSTALL_NO_MODULE_BUILDS=1 in /var/lib/VBoxGuestAdditions/config. Remove the separate udevsetup and cleanup commands again and make them part of the normal INSTALL_NO_MODULE_BUILDS=1 setup and cleanup. In addition, fix start and stop not to try to load and unload the modules with INSTALL_NO_MODULE_BUILDS=1.

File:

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

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

@@ -33 +33 @@
 
 # Testing:
-# * Should fail if the configuration file is missing or missing INSTALL_[DIR|VER].
-# * vboxadd user and vboxsf groups should be created if they do not exist.
-# * udev rule should be successfully created.
+# * Should fail if the configuration file is missing or missing INSTALL_DIR or
+#   INSTALL_VER entries.
+# * vboxadd user and vboxsf groups should be created if they do not exist - test
+#   by removing them before installing.
 # * Shared folders can be mounted and auto-mounts accessible to vboxsf group,
 #   including on recent Fedoras with SELinux.
-# * Setting INSTALL_NO_MODULE_BUILDS inhibits modules, users, udev in setup and
-#   cleanup but not the shared folder group creation.
-# * rcvboxadd udev[cleanup] sets up udev and creates the user but skips modules,
-#   shared folders and group creation.
+# * Setting INSTALL_NO_MODULE_BUILDS inhibits modules and module automatic
+#   rebuild script creation; otherwise modules, user, group, rebuild script,
+#   udev rule and shared folder mount helper should be created/set up.
+# * Setting INSTALL_NO_MODULE_BUILDS inhibits module load and unload on start
+#   and stop.
 # * Uninstalling the Additions and re-installing them does not trigger warnings.
 
@@ -204 +206 @@
     # If we got this far assume that the slow set-up has been done.
     QUICKSETUP=yes
-    uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
-        ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
-        no_udev=1
-    running_vboxguest || {
-        rm -f $dev || {
-            fail "Cannot remove $dev"
+    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+        uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
+            ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
+            no_udev=1
+        running_vboxguest || {
+            rm -f $dev || {
+                fail "Cannot remove $dev"
+            }
+
+            rm -f $userdev || {
+                fail "Cannot remove $userdev"
+            }
+
+            $MODPROBE vboxguest >/dev/null 2>&1 || {
+                setup
+                $MODPROBE vboxguest >/dev/null 2>&1 || {
+                    "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
+                    fail "modprobe vboxguest failed"
+                }
+            }
+            case "$no_udev" in 1)
+                sleep .5;;
+            esac
         }
-
-        rm -f $userdev || {
-            fail "Cannot remove $userdev"
-        }
-
-        $MODPROBE vboxguest >/dev/null 2>&1 || {
-            setup
-            $MODPROBE vboxguest >/dev/null 2>&1 || {
-                "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
-                fail "modprobe vboxguest failed"
+        case "$no_udev" in 1)
+            do_vboxguest_non_udev;;
+        esac
+
+        running_vboxsf || {
+            $MODPROBE vboxsf > /dev/null 2>&1 || {
+                if dmesg | grep "VbglR0SfConnect failed" > /dev/null 2>&1; then
+                    info "Unable to start shared folders support.  Make sure that your VirtualBox build supports this feature."
+                else
+                    info "modprobe vboxsf failed"
+                fi
             }
         }
-        case "$no_udev" in 1)
-            sleep .5;;
-        esac
-    }
-    case "$no_udev" in 1)
-        do_vboxguest_non_udev;;
-    esac
-
-    running_vboxsf || {
-        $MODPROBE vboxsf > /dev/null 2>&1 || {
-            if dmesg | grep "VbglR0SfConnect failed" > /dev/null 2>&1; then
-                info "Unable to start shared folders support.  Make sure that your VirtualBox build supports this feature."
-            else
-                info "modprobe vboxsf failed"
-            fi
-        }
-    }
+    fi  # INSTALL_NO_MODULE_BUILDS
 
     # Put the X.Org driver in place.  This is harmless if it is not needed.
@@ -283 +287 @@
         fail "Cannot unmount vboxsf folders"
     fi
+    test -n "${INSTALL_NO_MODULE_BUILDS}" && return 0
     modprobe -q -r -a vboxvideo vboxsf vboxguest
     if egrep -q 'vboxguest|vboxsf|vboxvideo' /proc/modules; then
@@ -452 +457 @@
     chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
 
-    setup_modules
+    test -z "${INSTALL_NO_MODULE_BUILDS}" && setup_modules
     create_vbox_user
     create_udev_rule
-    create_module_rebuild_script
+    test -z "${INSTALL_NO_MODULE_BUILDS}" && create_module_rebuild_script
     test -n "${QUICKSETUP}" && return 0
     shared_folder_setup
@@ -467 +472 @@
 cleanup()
 {
-    # Delete old versions of VBox modules.
-    cleanup_modules
-    depmod
-
-    # Remove old module sources
-    for i in $OLDMODULES; do
-      rm -rf /usr/src/$i-*
-    done
+    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+        # Delete old versions of VBox modules.
+        cleanup_modules
+        depmod
+
+        # Remove old module sources
+        for i in $OLDMODULES; do
+          rm -rf /usr/src/$i-*
+        done
+    fi
 
     # Clean-up X11-related bits
@@ -481 +488 @@
     # Remove other files
     rm /sbin/mount.vboxsf 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
+    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+        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
+    fi
     rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
 }
@@ -509 +518 @@
     ;;
 setup)
-    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
-        setup
-    else
-        shared_folder_setup
-    fi
+    setup
     start
     ;;
@@ -521 +526 @@
     ;;
 cleanup)
-    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
-        cleanup
-    else
-        rm /sbin/mount.vboxsf 2>/dev/null
-    fi
-    ;;
-udevsetup)
-    create_vbox_user
-    create_udev_rule
-    ;;
-udevcleanup)
-    rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
+    cleanup
     ;;
 status)
@@ -538 +532 @@
     ;;
 *)
-    echo "Usage: $0 {start|stop|restart|status|setup|quicksetup|cleanup|udevsetup|udevcleanup} [quiet]"
+    echo "Usage: $0 {start|stop|restart|status|setup|quicksetup|cleanup} [quiet]"
     exit 1
 esac