Changeset 76046 in vbox

Timestamp:

Dec 7, 2018 10:18:49 AM (6 years ago)

Author:

vboxsync

Message:

Linux installers: do not call daemon-restart too often.
bugref:3809: Linux installer maintenance
Some versions of systemd can crash if daemon-restart is called too often, so
only call it once per installation or uninstallation. Do some clean-up of
overly-generic shell script as well.

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/install.sh.in (modified) (2 diffs)
• Installer/linux/postinst-common.sh (modified) (1 diff)
• Installer/linux/prerm-common.sh (modified) (1 diff)
• Installer/linux/routines.sh (modified) (3 diffs)

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -471 +471 @@
 
 # Install, set up and start init scripts
-for i in "$INSTALLATION_DIR/init/vboxadd" "$INSTALLATION_DIR/init/vboxadd-service"; do
-    install_init_script "$i" "`basename "$i"`" 2>> "${LOGFILE}"
-    addrunlevel "`basename "$i"`" 2>> "${LOGFILE}"
-    start_init_script "`basename "$i"`" 2>> "${LOGFILE}"
-done
+install_init_script "$INSTALLATION_DIR"/init/vboxadd vboxadd 2>> "$LOGFILE"
+install_init_script "$INSTALLATION_DIR"/init/vboxadd-service vboxadd-service \
+    2>> "$LOGFILE"
+finish_init_script_install
+addrunlevel vboxadd 2>> "$LOGFILE"
+addrunlevel vboxadd-service 2>> "$LOGFILE"
+start_init_script vboxadd 2>> "$LOGFILE"
+start_init_script vboxadd-service 2>> "$LOGFILE"
 
 cp $ROUTINES $INSTALLATION_DIR
@@ -509 +512 @@
 
 # Stop and clean up all services
-for i in "$INSTALLATION_DIR/init/vboxadd-service" "$INSTALLATION_DIR/init/vboxadd"; do
-    if test -r "\$i"; then
-        stop_init_script "\`basename "\$i"\`" 2>> "${LOGFILE}"
-        test -z "\${NO_CLEANUP}" && grep -q '^# *cleanup_script *$' "\${i}" && "\${i}" cleanup 2>> "\$LOGFILE"
-        delrunlevel "\`basename "\$i"\`" 2>> "${LOGFILE}"
-        remove_init_script "\`basename "\$i"\`" 2>> "${LOGFILE}"
-    fi
-done
+if test -r "$INSTALLATION_DIR"/init/vboxadd-service; then
+    stop_init_script vboxadd-service 2>> "\$LOGFILE"
+    delrunlevel vboxadd-service 2>> "\$LOGFILE"
+    remove_init_script vboxadd-service 2>> "\$LOGFILE"
+fi
+if test -r "$INSTALLATION_DIR"/init/vboxadd; then
+    stop_init_script vboxadd 2>> "\$LOGFILE"
+    test -n "\$NO_CLEANUP" || "$INSTALLATION_DIR"/init/vboxadd cleanup 2>> "\$LOGFILE"
+    delrunlevel vboxadd 2>> "\$LOGFILE"
+    remove_init_script vboxadd 2>> "\$LOGFILE"
+fi
+finish_init_script_install
 
 # Load all modules

trunk/src/VBox/Installer/linux/postinst-common.sh

@@ -57 +57 @@
 install_init_script "${MY_PATH}/vboxautostart-service.sh" vboxautostart-service
 install_init_script "${MY_PATH}/vboxweb-service.sh" vboxweb-service
+finish_init_script_install
 
 delrunlevel vboxdrv

trunk/src/VBox/Installer/linux/prerm-common.sh

@@ -67 +67 @@
 delrunlevel vboxnet >/dev/null 2>&1
 remove_init_script vboxnet >/dev/null 2>&1
+finish_init_script_install
 rm -f /sbin/vboxconfig
 exit 0

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

@@ -173 +173 @@
 WantedBy=multi-user.target
 EOF
-    systemctl daemon-reexec
-}
-
-## Installs a file containing a shell script as an init script
+}
+
+use_systemd()
+{
+    test ! -f /sbin/init || test -L /sbin/init
+}
+
+## Installs a file containing a shell script as an init script.  Call
+# finish_init_script_install when all scripts have been installed.
 install_init_script()
 {
@@ -191 +196 @@
     ln -s "${script}" "/sbin/rc${name}"
     if test -x "`which systemctl 2>/dev/null`"; then
-        if ! test -f /sbin/init || ls -l /sbin/init | grep -q ">.*systemd"; then
+        if use_systemd; then
             { systemd_wrap_init_script "$script" "$name"; return; }
         fi
@@ -219 +224 @@
     rm -f "/etc/rc.d/init.d/$name"
     rm -f "/etc/init.d/$name"
+}
+
+## Tell systemd services have been installed or removed.  Should not be done
+# after each individual one, as systemd can crash if it is done too often
+# (reported by the OL team for OL 7.6, may not apply to other versions.)
+finish_init_script_install()
+{
+    if use_systemd; then
+        systemctl daemon-reexec
+    fi
 }