Message ID | 20171020103840.32762-16-wei.liu2@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 76730f1..363e888 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -524,7 +524,8 @@ sub target_run_apt { my ($ho, @aptopts) = @_; target_cmd_root($ho, "DEBIAN_PRIORITY=critical UCF_FORCE_CONFFOLD=y \\ - with-lock-ex -w /var/lock/osstest-apt apt-get @aptopts", 3000); + with-lock-ex -w /var/lock/osstest-apt \\ + apt-get -o Dpkg::Options::=\"--force-confold\" @aptopts", 3000); } sub target_install_packages { my ($ho, @packages) = @_;
Upgrading configuration file of nbd-client is controlled by dpkg in stretch. Add dpkg option to keep old configuration file(s). Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Osstest/TestSupport.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)