Changeset 82263 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 28, 2019 10:21:30 AM (5 years ago)

Author:

vboxsync

Message:

Installer/linux: add more dependency hints for vboxweb systemd service creation and use them when writing out the service. Also improve detection of python2 for the XPCOM bindings install.

Location:

trunk/src/VBox/Installer/linux

Files:

• routines.sh (modified) (3 diffs)
• vboxweb-service.sh (modified) (1 diff)

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

@@ -145 +145 @@
     description=`sed -n 's/# *Short-Description: *\(.*\)/\1/p' "${script}"`
     required=`sed -n 's/# *Required-Start: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
+    required_target=`sed -n 's/# *X-Required-Target-Start: *\(.*\)/\1/p' "${script}"`
     startbefore=`sed -n 's/# *X-Start-Before: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
     runlevels=`sed -n 's/# *Default-Start: *\(.*\)/\1/p' "${script}"`
@@ -151 +152 @@
     targets=`for i in ${runlevels}; do printf "runlevel${i}.target "; done`
     before=`for i in ${startbefore}; do printf "${i}.service "; done`
-    after=`for i in ${required}; do printf "${i}.service "; done`
+    after=`for i in ${required_target}; do printf "${i}.target "; done` `for i in ${required}; do printf "${i}.service "; done`
     cat > "${unit_path}/${name}.service" << EOF
 [Unit]
@@ -392 +393 @@
     VBOX_INSTALL_PATH="${1}"
 
-    PYTHON=python
-    if [ "`python -c 'import sys
-if sys.version_info >= (2, 6):
-    print \"test\"' 2> /dev/null`" != "test" ]; then
-        echo  1>&2 "Python 2.6 or later not available, skipping bindings installation."
+    # Check for python2 only, because the generic package does not provide
+    # any XPCOM bindings support for python3 since there is no standard ABI.
+    for p in python python2 python2.6 python 2.7; do
+        if [ "`$p -c 'import sys
+if sys.version_info >= (2, 6) and sys.version_info < (3, 0):
+    print \"test\"' 2> /dev/null`" = "test" ]; then
+            PYTHON=$p
+        fi
+    done
+    if [ -z "$PYTHON" ]; then
+        echo  1>&2 "Python 2 (2.6 or 2.7) not available, skipping bindings installation."
         return 1
     fi

trunk/src/VBox/Installer/linux/vboxweb-service.sh

@@ -27 +27 @@
 # Default-Stop:   0 1 6
 # Description:    VirtualBox web service API
+# X-Required-Target-Start: network-online
 ### END INIT INFO