Changeset 66413 in vbox

Timestamp:

Apr 4, 2017 9:42:44 AM (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. Now added forgotten changes to cleanup as well. Normal setup and cleanup will take care of the shared folder parts only (including user group) if INSTALL_NO_MODULE_BUILDS=1 is set. In addition, the udevsetup (was: udev) and udevcleanup commands will put in place or remove the udev rule for the kernel and create the Additions user.

File:

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

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

@@ -38 +38 @@
 # * 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.
+# * 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.
+# * Uninstalling the Additions and re-installing them does not trigger warnings.
 
 PATH=$PATH:/bin:/sbin:/usr/sbin
@@ -517 +520 @@
     setup
     ;;
-udev)
+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
     ;;
-cleanup)
-    cleanup
+udevcleanup)
+    rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
     ;;
 status)
@@ -527 +538 @@
     ;;
 *)
-    echo "Usage: $0 {start|stop|restart|status|setup|quicksetup|cleanup} [quiet]"
+    echo "Usage: $0 {start|stop|restart|status|setup|quicksetup|cleanup|udevsetup|udevcleanup} [quiet]"
     exit 1
 esac