Changeset 66401 in vbox

Timestamp:

Apr 3, 2017 2:01:06 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

114353

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. As there was quite a bit of change I added a number of relevant test descriptions in comments at the top and went through them on a Fedora 25 guest before committing.

File:

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

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

@@ -32 +32 @@
 # changes please try to reduce differences between the two wherever possible.
 
+# 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.
+# * Shared folders can be mounted and auto-mounts accessible to vboxsf group,
+#   including on recent Fedoras with SELinux.
+# * Setting INSTALL_NO_MODULE_BUILDS does not set up modules, users, udev.
+# * rcvboxadd udev sets up udev but not modules, users, shared folders.
+
 PATH=$PATH:/bin:/sbin:/usr/sbin
 PACKAGE=VBoxGuestAdditions
@@ -110 +119 @@
 owner=vboxadd
 group=1
+
+if test -r $config; then
+  . $config
+else
+  fail "Configuration file $config not found"
+fi
+test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
+  fail "Configuration file $config not complete"
 
 running_vboxguest()
@@ -184 +201 @@
     # If we got this far assume that the slow set-up has been done.
     QUICKSETUP=yes
-    if test -r $config; then
-      . $config
-    else
-      fail "Configuration file $config not found"
-    fi
-    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-      fail "Configuration file $config not complete"
     uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
         ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
@@ -321 +331 @@
         "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
             info "Look at $LOG to find out what went wrong"
-        return 1
+        return 0
     fi
     log "Building the shared folder support module"
@@ -329 +339 @@
         --no-print-directory install >> $LOG 2>&1; then
         info  "Look at $LOG to find out what went wrong"
-        return 1
+        return 0
     fi
     log "Building the graphics driver module"
@@ -346 +356 @@
 }
 
-# Do non-kernel bits needed for the kernel modules to work properly (user
-# creation, udev, mount helper...)
-extra_setup()
+create_vbox_user()
 {
     log "Creating user for the Guest Additions."
@@ -357 +365 @@
     useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
 
-    # Add a group "vboxsf" for Shared Folders access
-    # All users which want to access the auto-mounted Shared Folders have to
-    # be added to this group.
-    groupadd -r -f vboxsf >/dev/null 2>&1
-
+}
+
+create_udev_rule()
+{
     # Create udev description file
     if [ -d /etc/udev/rules.d ]; then
@@ -387 +394 @@
         echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
     fi
-
-    # Put mount.vboxsf in the right place
-    ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin
+}
+
+create_module_rebuild_script()
+{
     # And a post-installation script for rebuilding modules when a new kernel
     # is installed.
@@ -407 +415 @@
 EOF
     chmod 0755 /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd
+}
+
+shared_folder_setup()
+{
+    # Add a group "vboxsf" for Shared Folders access
+    # All users which want to access the auto-mounted Shared Folders have to
+    # be added to this group.
+    groupadd -r -f vboxsf >/dev/null 2>&1
+
+    # Put the mount.vboxsf mount helper in the right place.
+    ## @todo It would be nicer if the kernel module just parsed parameters
+    # itself instead of needing a separate binary to do that.
+    ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin
     # SELinux security context for the mount helper.
     if test -e /etc/selinux/config; then
@@ -421 +442 @@
 setup()
 {
-    if test -r $config; then
-      . $config
-    else
-      fail "Configuration file $config not found"
-    fi
-    test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-      fail "Configuration file $config not complete"
     export BUILD_TYPE
     export USERNAME
@@ -435 +449 @@
     chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
 
-    if test -n "${INSTALL_NO_MODULE_BUILDS}" || setup_modules; then
-        mod_succ=0
-    else
-        mod_succ=1
-    fi
-    test -n "${QUICKSETUP}" && return "${mod_succ}"
-    extra_setup
-    test -n "${INSTALL_NO_MODULE_BUILDS}" && return 0
-    if [ "$mod_succ" -eq "0" ]; then
-        if running_vboxguest || running_vboxadd; then
-            info "You should restart your guest to make sure the new modules are actually used"
-        fi
-    fi
-    return "${mod_succ}"
+    setup_modules
+    create_vbox_user
+    create_udev_rule
+    create_module_rebuild_script
+    test -n "${QUICKSETUP}" && return 0
+    shared_folder_setup
+    if  running_vboxguest || running_vboxadd; then
+        info "Running kernel modules will not be replaced until the system is restarted"
+    fi
+    return 0
 }
 
@@ -454 +464 @@
 cleanup()
 {
-    if test -r $config; then
-      . $config
-      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
-        fail "Configuration file $config not complete"
-    else
-      fail "Configuration file $config not found"
-    fi
-
     # Delete old versions of VBox modules.
     cleanup_modules
@@ -504 +506 @@
     ;;
 setup)
-    setup && start
+    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
+        setup
+    else
+        shared_folder_setup
+    fi
+    start
     ;;
 quicksetup)
     QUICKSETUP=yes
     setup
+    ;;
+udev)
+    create_udev_rule
     ;;
 cleanup)