From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 06:47:06 +0000 (+0200)
Subject: Of course just restoring the default symlink is not sufficient -- we also have to... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a063f9b393a7f664766e1e70b63b8a3cad3be9db;p=mirror%2Fdsa-puppet.git

Of course just restoring the default symlink is not sufficient -- we also have to retire our own
---

diff --git a/modules/systemdtimesyncd/manifests/init.pp b/modules/systemdtimesyncd/manifests/init.pp
index 6a9a298a5..a0d5b1224 100644
--- a/modules/systemdtimesyncd/manifests/init.pp
+++ b/modules/systemdtimesyncd/manifests/init.pp
@@ -20,5 +20,13 @@ class systemdtimesyncd {
 			content => template('systemdtimesyncd/timesyncd.conf.erb'),
 			notify  => Service['systemd-timesyncd'],
 		}
+
+		# Up until 2019-09 we had timesyncd started by multi-user.target instead of the default
+		# sysinit.target.wants.  We are moving back to sysinit.target.wants (for now).
+		file { '/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service':
+			ensure => 'absent',
+			notify => Exec['systemctl daemon-reload'],
+		}
+
 	}
 }