summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:31:42 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:31:42 +0100
commitd30069c178ff2aff9154f65bd7dbf988c4d002f1 (patch)
treec710585866e623dd595b35bc921261a364ec64c8 /files
parentee6d13d1e42acca7374aa302a4f9dfa9001d799f (diff)
parentd97a49b7b2c020c2c43df6524236f50a421789ee (diff)
Merge commit 'd97a49b7b2c020c2c43df6524236f50a421789ee'.
Going on merging immerda changes. Incompatible change: I do prefer my own generic apt/preferences template to shipping a static file that only supports Lenny. My own template supports security, backports, volatile, next release etc. Conflicts: files/preferences manifests/init.pp manifests/preferences.pp
Diffstat (limited to 'files')
-rw-r--r--files/preferences_snippet.erb4
1 files changed, 4 insertions, 0 deletions
diff --git a/files/preferences_snippet.erb b/files/preferences_snippet.erb
new file mode 100644
index 0000000..4dfb701
--- /dev/null
+++ b/files/preferences_snippet.erb
@@ -0,0 +1,4 @@
+Package: <%= name %>
+Pin: release a=<%= release %>
+Pin-Priority: <%= priority %>
+