switch to new lsb way

diff --git a/manifests/default_sources_list.pp b/manifests/default_sources_list.pp
index 8c14b53d693629414b14b037d5d2e39c1b6a96cc..7db65355631066d641ab3b6c87f7a86162a9b1ea 100644 (file)
--- a/manifests/default_sources_list.pp
+++ b/manifests/default_sources_list.pp
@@ -1,10 +1,11 @@
 class apt::default_sources_list {
+  include lsb
   config_file {
     # include main, security and backports
     # additional sources could be included via an array
     "/etc/apt/sources.list":
       content => template("apt/sources.list.erb"),
-      require => Exec[assert_lsbdistcodename];
+      require => Package['lsb'];
   }
 }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index c2dd54779194c60f5b4271ce5c58ab0c194baa2d..eaf6bb8d46a250563d277aab19fd5fd02855814d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,17 +13,15 @@ class apt {
 
   package { apt: ensure => installed }
 
-  # a few templates need lsbdistcodename
-  include assert_lsbdistcodename
-
   case $custom_sources_list {
     '': {
       include apt::default_sources_list
     }
     default: {
+      include lsb
       config_file { "/etc/apt/sources.list":
         content => $custom_sources_list,
-        require => Exec[assert_lsbdistcodename];
+        require => Exec['lsb'];
       }
     }
   }