summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-07-21 11:43:27 -0400
committerScott Moser <smoser@ubuntu.com>2010-07-21 11:43:27 -0400
commit944c1d1981c8eb9fc163621b3134b1d21ee6d1fa (patch)
tree8bed7d7b01455d3791afdf4aa703d38cbc233208
parent1dfeedecd8018705cd43e35afa1b767372d6b8cd (diff)
downloadvyos-cloud-init-944c1d1981c8eb9fc163621b3134b1d21ee6d1fa.tar.gz
vyos-cloud-init-944c1d1981c8eb9fc163621b3134b1d21ee6d1fa.zip
invoke apt so dpkg non-interactively takes old conf files (LP: #607642)
-rw-r--r--cloudinit/CloudConfig/cc_apt_update_upgrade.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_apt_update_upgrade.py b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
index 50c93222..e1226c85 100644
--- a/cloudinit/CloudConfig/cc_apt_update_upgrade.py
+++ b/cloudinit/CloudConfig/cc_apt_update_upgrade.py
@@ -65,7 +65,10 @@ def handle(name,cfg,cloud,log,args):
e['DEBIAN_FRONTEND']='noninteractive'
if upgrade:
- subprocess.Popen(['apt-get', 'upgrade', '--assume-yes'], env=e).communicate()
+ cmd=[ 'apt-get', '--option', 'Dpkg::Options::=--force-confold',
+ 'upgrade', '--assume-yes' ]
+
+ subprocess.Popen(cmd, env=e).communicate()
if pkglist:
cmd=['apt-get', 'install', '--assume-yes']