multiple sources for templates are not allowed (see #1818), so revert it to a single...

diff --git a/README b/README
index 7abb1ea99791e0f7aef1433bc7a59576973cd2f6..109c92a34c6f94c5ab75e4481021281316ce2692 100644 (file)
--- a/README
+++ b/README
@@ -233,11 +233,11 @@ following in your manifest:
 
   apt::preseeded_package { locales: }
 
-You can also specify 'content' to define this file via a template. Here's an
-example for preseeding installation of the 'mysql' package with a template:
+You can also specify the content of the seed via the content parameter, 
+for example:
 
-  apt::preseeded_package { "mysql":
-    content => template("site-apt/mysql.seed.erb"),
+  apt::preseeded_package { "apticron":
+    content => "apticron   apticron/notification   string  root@example.com",
   }
 
 apt::sources_list

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