summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2012-08-16 09:35:21 +0200
committermh <mh@immerda.ch>2012-08-16 09:35:21 +0200
commit0c2f31b5d5c972c179cb06ea1a06e6e0e7b1b262 (patch)
tree55e38dde8d7f0fce7a08fb39774084e724e1a2e3 /templates
parentf823fcd5b7408d7d690cfc5c5063e28db06271a4 (diff)
parent4f433dbd5238e6b5211d3b0f240ff58031c3da2b (diff)
Merge remote-tracking branch 'shared/master'
Conflicts: README manifests/dist_upgrade/initiator.pp manifests/init.pp manifests/preseeded_package.pp manifests/unattended_upgrades.pp
Diffstat (limited to 'templates')
l---------templates/Ubuntu/preferences_lucid.erb1
l---------templates/Ubuntu/preferences_oneiric.erb1
l---------templates/Ubuntu/preferences_precise.erb1
-rw-r--r--templates/preferences_snippet.erb4
-rw-r--r--templates/preferences_snippet_release.erb4
5 files changed, 9 insertions, 2 deletions
diff --git a/templates/Ubuntu/preferences_lucid.erb b/templates/Ubuntu/preferences_lucid.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_lucid.erb
@@ -0,0 +1 @@
+preferences_maverick.erb \ No newline at end of file
diff --git a/templates/Ubuntu/preferences_oneiric.erb b/templates/Ubuntu/preferences_oneiric.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_oneiric.erb
@@ -0,0 +1 @@
+preferences_maverick.erb \ No newline at end of file
diff --git a/templates/Ubuntu/preferences_precise.erb b/templates/Ubuntu/preferences_precise.erb
new file mode 120000
index 0000000..3debe4f
--- /dev/null
+++ b/templates/Ubuntu/preferences_precise.erb
@@ -0,0 +1 @@
+preferences_maverick.erb \ No newline at end of file
diff --git a/templates/preferences_snippet.erb b/templates/preferences_snippet.erb
index 4dfb701..b7acaab 100644
--- a/templates/preferences_snippet.erb
+++ b/templates/preferences_snippet.erb
@@ -1,4 +1,4 @@
-Package: <%= name %>
-Pin: release a=<%= release %>
+Package: <%= real_package %>
+Pin: <%= pin %>
Pin-Priority: <%= priority %>
diff --git a/templates/preferences_snippet_release.erb b/templates/preferences_snippet_release.erb
new file mode 100644
index 0000000..845d23f
--- /dev/null
+++ b/templates/preferences_snippet_release.erb
@@ -0,0 +1,4 @@
+Package: <%= real_package %>
+Pin: release a=<%= release %>
+Pin-Priority: <%= priority %>
+