Changeset 69007 in vbox

Timestamp:

Oct 6, 2017 3:31:05 PM (7 years ago)

Author:

vboxsync

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

118276

Message:

Additions: missing conflict with systemd-timesyncd.service for guest service.
bugref:3809: Linux installer maintenance

This change adds "Conflicts=systemd-timesyncd.service" to the systemd unit
file for the guest service. This prevents our time synchronisation service
and the systemd time synchronisation service from running at the same time.
See Debian bug 873263.
​https://bugs.debian.org/873263
Thank you Gianfranco Costamagna <locutusofborg@…>.

Location:

trunk/src/VBox

Files:

• Additions/linux/installer/vboxadd-service.sh (modified) (2 diffs)
• Installer/linux/routines.sh (modified) (2 diffs)

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

@@ -14 +14 @@
 #
 
+# X-Conflicts-With is our own invention, which we use when converting to
+# a systemd unit.
+
 # chkconfig: 345 35 65
 # description: VirtualBox Additions service
@@ -23 +26 @@
 # Default-Start:  2 3 4 5
 # Default-Stop:   0 1 6
+# X-Conflicts-With: systemd-timesyncd.service
 # Description:    VirtualBox Additions Service
 ### END INIT INFO

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

@@ -123 +123 @@
     test -n "${unit_path}" || \
         { echo "$self: systemd unit path not found" >&2 && return 1; }
+    conflicts=`sed -n 's/# *X-Conflicts-With: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
     description=`sed -n 's/# *Short-Description: *\(.*\)/\1/p' "${script}"`
     required=`sed -n 's/# *Required-Start: *\(.*\)/\1/p' "${script}" | sed 's/\$[a-z]*//'`
@@ -138 +139 @@
 Before=${targets}shutdown.target ${before}
 After=${after}
-Conflicts=shutdown.target
+Conflicts=shutdown.target ${conflicts}
 
 [Service]