X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsystemdtimesyncd%2Fmanifests%2Finit.pp;h=a0d5b1224557fe1c33678bc4a48fa7406d97fd65;hb=01d7face6862a6c5df558e6cb238fe6833d5bc4a;hp=6a9a298a567f62062d0bcf6a45b51f44c0a6b6e1;hpb=79bd42de3ee78f430fc810e08a5c40f1eeb46a04;p=mirror%2Fdsa-puppet.git

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'],
+		}
+
 	}
 }