summaryrefslogtreecommitdiff
path: root/cloudinit/distros/debian.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2013-04-03 16:06:43 -0500
committerScott Moser <smoser@brickies.net>2013-04-03 16:06:43 -0500
commit05c22e4f202332332de051e6849bbf5210aa19f6 (patch)
treea028e93ad32cae6d6e59ded67e08dfd97e42cb09 /cloudinit/distros/debian.py
parent7dac7bbd48bb56971c2fddfcf13d439d577740c1 (diff)
downloadvyos-cloud-init-05c22e4f202332332de051e6849bbf5210aa19f6.tar.gz
vyos-cloud-init-05c22e4f202332332de051e6849bbf5210aa19f6.zip
invoke 'dist-upgrade' instead of 'upgrade' on for upgrades.
In general, dist-upgrade is the correct behavior here. It will get a new kernel, though, which could be annoying. So, allow a way to turn it off (by setting 'apt_get_upgrade_subcommand: upgrade'). LP: #1164147
Diffstat (limited to 'cloudinit/distros/debian.py')
-rw-r--r--cloudinit/distros/debian.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index 4b779d57..a1e28ad5 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -161,7 +161,13 @@ class Distro(distros.Distro):
elif args and isinstance(args, list):
cmd.extend(args)
- cmd.append(command)
+
+ subcmd = command
+ if command == "upgrade":
+ subcmd = self.get_option("apt_get_upgrade_subcommand",
+ "dist-upgrade")
+
+ cmd.append(subcmd)
pkglist = util.expand_package_list('%s=%s', pkgs)
cmd.extend(pkglist)