update apt::preseeded_package template sources to use $lsbdistcodename instead of...

diff --git a/README b/README
index 406266a0f3fba5ba6137204154140c470c8033f1..7abb1ea99791e0f7aef1433bc7a59576973cd2f6 100644 (file)
--- a/README
+++ b/README
@@ -226,10 +226,10 @@ apt::preseeded_package
 ----------------------
 
 This simplifies installation of packages for which you wish to preseed the
-answers to debconf. For example, if you wish to provide a preseed file
-for the locales package, you would place the locales.seed file in
-'templates/$debian_version/locales.seeds' and then include the following
-in your manifest:
+answers to debconf. For example, if you wish to provide a preseed file for the
+locales package, you would place the locales.seed file in
+'site-apt/templates/$lsbdistcodename/locales.seeds' and then include the
+following in your manifest:
 
   apt::preseeded_package { locales: }
 

diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 8f3bcbd128a2d079fbc1e1e7a671aad15131cdbc..74aafa5d312b1ef2bfe6eddb1d3bf75ccb0ad0c8 100644 (file)
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,7 +1,9 @@
 define apt::preseeded_package ($content = "", $ensure = "installed") {
   $seedfile = "/var/cache/local/preseeding/$name.seeds"
   $real_content = $content ? { 
-    ""      => template ( "$name.seeds", "$debian_version/$name.seeds" ),
+    ""      => template ( "site-apt/$name.seeds",
+                          "site-apt/$lsbdistcodename/$name.seeds",
+                          "$name.seeds", "$lsbdistcodename/$name.seeds" ),
     default => $content
   }