From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 26 Jul 2017 09:12:02 +0000 (+0200)
Subject: /var/run/motd no longer exists on stretch, link /etc/motd to /run/motd.dynamic instead
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1e389ee5fd9f5aa32e2e8d2983d95ff2a9b4c3c6;p=mirror%2Fdsa-puppet.git

/var/run/motd no longer exists on stretch, link /etc/motd to /run/motd.dynamic instead
---

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index cb42099c1..3a2b697de 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -15,9 +15,16 @@ class motd {
 		ensure => absent,
 	}
 
-	file { '/etc/motd':
-		ensure => link,
-		target => '/var/run/motd'
+	if versioncmp($::lsbmajdistrelease, '9') < 0 {
+		file { '/etc/motd':
+			ensure => link,
+			target => '/var/run/motd'
+		}
+	} else {
+		file { '/etc/motd':
+			ensure => link,
+			target => '/run/motd.dynamic'
+		}
 	}
 
 	file { '/etc/update-motd.d/puppet-motd':