From dd789066f139b1403b8006c11ac4bca9e91f1282 Mon Sep 17 00:00:00 2001 From: "Denis V. Meltsaykin" Date: Fri, 21 Aug 2015 18:35:17 +0300 Subject: [PATCH] Add extra options to apt-get to control conflicts As there might be a new config files in updated packages, there is possiblity that apt-get will fail at `upgrade`. Added 2 apt-get/dpkg options: -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" From now on all conflicts will be resolved with an existing versions of a config files. Change-Id: Ia3baf77121aacf416742921fe15bdd8cecc96a31 --- scripts/mos_apply_mu.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/mos_apply_mu.py b/scripts/mos_apply_mu.py index 9472d98..5d2fda2 100644 --- a/scripts/mos_apply_mu.py +++ b/scripts/mos_apply_mu.py @@ -282,7 +282,9 @@ def send_shell_script(ip, os_version): "|| echo -e \"\\ndeb http://{0}:8080/updates/ubuntu " "precise main\" >> /etc/apt/sources.list)\n" "apt-get update\n" - "apt-get upgrade -y\n".format(master_ip), + "apt-get -o Dpkg::Options::=\"--force-confdef\" -o " + "Dpkg::Options::=\"--force-confold\" -y " + "upgrade\n".format(master_ip), 'centos': "yum-config-manager --add-repo=http://{0}:8080/updates/" "centos/os/x86_64/\nyum update --skip-broken -y " -- 2.45.2