summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-12-07 23:57:25 -0500
committerMicah Anderson <micah@riseup.net>2010-12-07 23:57:25 -0500
commit36c4873f87af74ba1ab9f780db2992c788ef925f (patch)
tree2f211401fdf4a80d2adf69cf71c223db3387b335 /manifests
parentee21742cf8f59d6bf0f8f70d44d30b44556dde3d (diff)
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
Diffstat (limited to 'manifests')
-rw-r--r--manifests/preseeded_package.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 74aafa5..42c6200 100644
--- 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
}