File vbox-vboxadd-init-script.diff of Package virtualbox

Overview Repositories Revisions Requests Users Attributes Meta

File vbox-vboxadd-init-script.diff of Package virtualbox (Revision 2c139d43a24aa278222256b69d66945d)

Currently displaying revision 2c139d43a24aa278222256b69d66945d , Show latest

Index: VirtualBox-7.0.20/src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+++ VirtualBox-7.0.20/src/VBox/Additions/linux/installer/vboxadd.sh
@@ -36,11 +36,14 @@
 # Provides:       vboxadd
 # Required-Start:
 # Required-Stop:
-# Default-Start:  2 3 4 5
+# Should-Start:   $remote_fs
+# Should-Stop:    $remote_fs
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # X-Start-Before: display-manager
 # X-Service-Type: oneshot
 # Description:    VirtualBox Linux Additions kernel modules
+# Short-Description: VirtualBox Linux Additions kernel modules
 ### END INIT INFO
 
 ## @todo This file duplicates a lot of script with vboxdrv.sh.  When making
@@ -266,12 +269,6 @@ do_vboxguest_non_udev()
             fail "Cannot create device $dev with major $maj and minor $min"
         }
     fi
-    chown $owner:$group $dev 2>/dev/null || {
-        rm -f $dev 2>/dev/null
-        rm -f $userdev 2>/dev/null
-        rmmod vboxguest 2>/dev/null
-        fail "Cannot change owner $owner:$group for device $dev"
-    }
 
     if [ ! -c $userdev ]; then
         maj=10
@@ -282,12 +279,6 @@ do_vboxguest_non_udev()
                 rmmod vboxguest 2>/dev/null
                 fail "Cannot create device $userdev with major $maj and minor $min"
             }
-            chown $owner:$group $userdev 2>/dev/null || {
-                rm -f $dev 2>/dev/null
-                rm -f $userdev 2>/dev/null
-                rmmod vboxguest 2>/dev/null
-                fail "Cannot change owner $owner:$group for device $userdev"
-            }
         fi
     fi
 }
@@ -351,7 +342,7 @@ cleanup_modules()
         done
         if test -z "${keep}"; then
             rm -rf /lib/modules/"${KERN_VER}"
-            rm -f /boot/initrd.img-"${KERN_VER}"
+        rm -f /boot/initrd.img-"${KERN_VER}"
         fi
     done
     for i in ${OLDMODULES}; do
@@ -660,9 +651,9 @@ create_udev_rule()
         udevcontrol reload_rules >/dev/null 2>&1 || true
     fi
 }
-
-create_module_rebuild_script()
-{
+    # And an rc file to re-build the kernel modules and re-set-up the X server.
+    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
@@ -875,18 +866,17 @@ setup()
 already available for kernel $TARGET_VER and do not require to be rebuilt."
         else
             info "Building the VirtualBox Guest Additions kernel modules.  This may take a while."
-            info "To build modules for other installed kernels, run"
-            info "  /sbin/rcvboxadd quicksetup <version>"
-            info "or"
-            info "  /sbin/rcvboxadd quicksetup all"
-            if test -d /lib/modules/"$TARGET_VER"/build; then
-                setup_modules "$TARGET_VER"
-                depmod
-            else
-                info "Kernel headers not found for target kernel $TARGET_VER. \
+        info "To build modules for other installed kernels, run"
+        info "  /sbin/rcvboxadd quicksetup <version>"
+        info "or"
+        info "  /sbin/rcvboxadd quicksetup all"
+        if test -d /lib/modules/"$TARGET_VER"/build; then
+            setup_modules "$TARGET_VER"
+            depmod
+        else
+            info "Kernel headers not found for target kernel $TARGET_VER. \
 Please install them and execute
   /sbin/rcvboxadd setup"
-            fi
         fi
     fi
     create_vbox_user
@@ -904,17 +894,14 @@ Please install them and execute
     # Put the X.Org driver in place.  This is harmless if it is not needed.
     # Also set up the OpenGL library.
     myerr=`"${INSTALL_DIR}/init/vboxadd-x11" setup 2>&1`
-    test -z "${myerr}" || log "${myerr}"
-
-    return 0
+    succ_msg
 }
 
 # cleanup_script
 cleanup()
 {
-    if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
-        # Delete old versions of VBox modules.
-        cleanup_modules
+    # Delete old versions of VBox modules.
+    cleanup_modules
         depmod
 
         # Remove old module sources
@@ -924,12 +911,13 @@ cleanup()
     fi
 
     # Clean-up X11-related bits
-    "${INSTALL_DIR}/init/vboxadd-x11" cleanup
+    #/sbin/rcvboxadd-x11 cleanup
 
     # Remove other files
-    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 || true
+    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 || true
     fi
     rm -f /sbin/mount.vboxsf 2>/dev/null
     rm -f /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
Index: VirtualBox-7.0.20/src/VBox/Additions/linux/installer/vboxadd-service.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
+++ VirtualBox-7.0.20/src/VBox/Additions/linux/installer/vboxadd-service.sh
@@ -36,7 +36,7 @@
 # Provides:       vboxadd-service
 # Required-Start: vboxadd
 # Required-Stop:  vboxadd
-# Default-Start:  2 3 4 5
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # X-Conflicts-With: systemd-timesyncd.service
 # Description:    VirtualBox Additions Service
Index: VirtualBox-7.0.20/src/VBox/Installer/linux/vboxautostart-service.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/Installer/linux/vboxautostart-service.sh
+++ VirtualBox-7.0.20/src/VBox/Installer/linux/vboxautostart-service.sh
@@ -33,7 +33,7 @@
 # Provides:       vboxautostart-service
 # Required-Start: vboxdrv
 # Required-Stop:  vboxdrv
-# Default-Start:  2 3 4 5
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # Description:    VirtualBox autostart service
 ### END INIT INFO
Index: VirtualBox-7.0.20/src/VBox/Installer/linux/vboxballoonctrl-service.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
+++ VirtualBox-7.0.20/src/VBox/Installer/linux/vboxballoonctrl-service.sh
@@ -33,7 +33,7 @@
 # Provides:       vboxballoonctrl-service
 # Required-Start: vboxdrv
 # Required-Stop:  vboxdrv
-# Default-Start:  2 3 4 5
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # Description:    VirtualBox watchdog daemon
 ### END INIT INFO
Index: VirtualBox-7.0.20/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
+++ VirtualBox-7.0.20/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
@@ -41,7 +41,7 @@
 # Provides:       testboxscript-service
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 4 5
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # Description:    TestBoxScript service
 ### END INIT INFO
Index: VirtualBox-7.0.20/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
+++ VirtualBox-7.0.20/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
@@ -41,7 +41,7 @@
 # Provides:       vboxtxs
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 4 5
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # Description:    VirtualBox Test Execution Service
 ### END INIT INFO
Index: VirtualBox-7.0.20/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
===================================================================
--- VirtualBox-7.0.20.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
+++ VirtualBox-7.0.20/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
@@ -41,7 +41,7 @@
 # Provides:       vboxtxs
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 4 5
+# Default-Start:  2 3 5
 # Default-Stop:   0 1 6
 # Description:    VirtualBox Test Execution Service
 ### END INIT INFO

Places

File vbox-vboxadd-init-script.diff of Package virtualbox (Revision 2c139d43a24aa278222256b69d66945d)

Places