From 840ea9ed9d3e0a26e5a70db2143ebb3f0fea13b4 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 14 Feb 2011 10:52:25 +0100 Subject: Debian Squeeze pinning: pin squeeze-updates as much as regular squeeze. The previous template was indeed ensuring no package from squeeze-updates could be easily or automatically installed. --- templates/Debian/preferences_squeeze.erb | 5 +++++ 1 file changed, 5 insertions(+) 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 -- cgit v1.2.3 From 14cd91de33c823c093bb6a9af3ac9f7d27a0500b Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 18 Feb 2011 22:41:36 +0100 Subject: apt::cron::dist-upgrade: silently keep old version of conffiles. This makes this class' behaviour consistent with the apt::dist_upgrade one and prevents stalled upgrades due to dpkg asking questions to a dumb robot. --- manifests/cron/dist-upgrade.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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": -- cgit v1.2.3