diff options
| author | Scott Moser <smoser@brickies.net> | 2013-04-03 17:29:32 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2013-04-03 17:29:32 -0500 |
| commit | 3ed5f780fed21fb02b2c86b1f54650f92c941f36 (patch) | |
| tree | 6d4a5c632726a662a7eea512c99e0d95c162fc69 /cloudinit/distros | |
| parent | 7dac7bbd48bb56971c2fddfcf13d439d577740c1 (diff) | |
| parent | 05c22e4f202332332de051e6849bbf5210aa19f6 (diff) | |
| download | vyos-cloud-init-3ed5f780fed21fb02b2c86b1f54650f92c941f36.tar.gz vyos-cloud-init-3ed5f780fed21fb02b2c86b1f54650f92c941f36.zip | |
invoke dist-upgrade instead of upgrade for apt upgrades
dist-upgrade is generally more correct here to get all packages upgraded.
We add the options to change these in system_info. Also, document
the previous apt configuration change (apt_get_command).
LP: #1164147
Diffstat (limited to 'cloudinit/distros')
| -rw-r--r-- | cloudinit/distros/debian.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 4b779d57..0811eefd 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -161,7 +161,12 @@ 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) |