aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/cron/dist-upgrade.pp2
-rw-r--r--templates/Debian/preferences_squeeze.erb5
2 files changed, 6 insertions, 1 deletions
diff --git a/manifests/cron/dist-upgrade.pp b/manifests/cron/dist-upgrade.pp
index 3d7cf16..2568cb7 100644
--- a/manifests/cron/dist-upgrade.pp
+++ b/manifests/cron/dist-upgrade.pp
@@ -1,7 +1,7 @@
class apt::cron::dist-upgrade inherits apt::cron::base {
$action = "autoclean -y
-dist-upgrade -y -o APT::Get::Show-Upgraded=true
+dist-upgrade -y -o APT::Get::Show-Upgraded=true -o 'DPkg::Options::=--force-confold'
"
file { "/etc/cron-apt/action.d/3-download":
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb
index 3de7959..5e15d27 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences_squeeze.erb
@@ -3,6 +3,11 @@ Package: *
Pin: release o=Debian,n=<%= codename %>
Pin-Priority: 990
+Explanation: Debian <%= codename %>-updates
+Package: *
+Pin: release o=Debian,n=<%= codename %>-updates
+Pin-Priority: 990
+
Explanation: Debian backports
Package: *
Pin: origin backports.debian.org