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

Timestamp:

Jun 30, 2017 1:43:48 PM (8 years ago)

Author:

vboxsync

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

116590

Message:

bugref:8910: Additions/linux: 3D pass-through not working on Fedora 25 and 26 alpha

Disable EGL guest library and make vboxadd service finish before gdm starts.

Fedora 26 Alpha was failing to start the display server because it was trying
to use our EGL library, which only worked under X11. Since that library was
only written to support Qt 5 applications, and Qt 5 switched back to using
GLX by default shortly after, we simply disable it.

Fedora 25 was failing to log in because the log-in screen started before our
3D libraries were put in place but the user session started after. We solve
this by changing the vboxadd systemd service to finish before the display
manager service is started, as suggested by Hans de Goede. Many thanks.

File:

• trunk/src/VBox/Installer/linux/routines.sh (modified) (2 diffs)

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

@@ -125 +125 @@
     description=`sed -n 's/# *Short-Description: *\(.*\)/\1/p' "${script}"`
     required=`sed -n 's/# *Required-Start: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
+    startbefore=`sed -n 's/# *X-Start-Before: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
     runlevels=`sed -n 's/# *Default-Start: *\(.*\)/\1/p' "${script}"`
-    before=`for i in ${runlevels}; do printf "runlevel${i}.target "; done`
+    servicetype=`sed -n 's/# *X-Service-Type: *\(.*\)/\1/p' "${script}"`
+    test -z "${servicetype}" && servicetype="forking"
+    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`
     cat > "${unit_path}/${name}.service" << EOF
@@ -132 +136 @@
 SourcePath=${script}
 Description=${description}
-Before=${before}shutdown.target
+Before=${targets}shutdown.target ${before}
 After=${after}
 Conflicts=shutdown.target
 
 [Service]
-Type=forking
+Type=${servicetype}
 Restart=no
 TimeoutSec=5min