multiple sources for templates are not allowed (see #1818), so revert it to a single source referenced by the README, and clarify the README to indicate how you can pass the preseed contents directly

This commit is contained in:
Micah Anderson 2010-12-07 23:57:25 -05:00
parent ee21742cf8
commit 36c4873f87
2 changed files with 5 additions and 7 deletions

8
README
View file

@ -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

View file

@ -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
}