updatemotd exec is not used anywhere anymore. Remove.

[mirror/dsa-puppet.git] / modules / motd / manifests / init.pp

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index cb42099..3bf224b 100644 (file)
--- 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':
@@ -25,9 +32,4 @@ class motd {
                mode    => '0555',
                content => template('motd/motd.erb')
        }
-
-       exec { 'updatemotd':
-               command     => 'uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd',
-               refreshonly => true,
-       }
 }