From b98efc4f2906ada0768e75737f253e5b6bf749b7 Mon Sep 17 00:00:00 2001
From: Michael Beaver <michael.beaver@att.com>
Date: Mon, 16 Mar 2020 13:09:04 -0500
Subject: [PATCH] Update dpkg commands to be non-interactive

The current `dpkg --configure -a` command does not always work if the
package that needs to be configured has a modified conffile which can
require user input to resolve. This change adds flags to make these
lines work as intended in that scenario.

Change-Id: I8f459b0c1c2fc7ecbe1ff478bdb77fd9af31dc90
---
 divingbell/templates/bin/_apt.sh.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/divingbell/templates/bin/_apt.sh.tpl b/divingbell/templates/bin/_apt.sh.tpl
index b6cb5b9..ba980ff 100644
--- a/divingbell/templates/bin/_apt.sh.tpl
+++ b/divingbell/templates/bin/_apt.sh.tpl
@@ -111,7 +111,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update
 {{- end }}
 
 # Run dpkg in case of interruption of previous dpkg operation
-dpkg --configure -a
+dpkg --configure -a --force-confold,confdef
 
 # Perform package installs
 set +x
@@ -192,7 +192,7 @@ if [ -f ${persist_path}/packages ]; then
     TO_KEEP=$(echo "$TO_DELETE" | comm -23 ${persist_path}/packages -)
     {{- end }}
     if [ ! -z "$TO_DELETE" ]; then
-        dpkg --configure -a
+        dpkg --configure -a --force-confold,confdef
 
         {{- if hasKey .Values.conf.apt "whitelistpkgs" }}
         WHITELIST=({{ include "helm-toolkit.utils.joinListWithSpace" .Values.conf.apt.whitelistpkgs }})
@@ -236,7 +236,7 @@ fi
 ######################################################
 
 {{- if hasKey .Values.conf.apt "blacklistpkgs" }}
-dpkg --configure -a
+dpkg --configure -a --force-confold,confdef
 {{- range .Values.conf.apt.blacklistpkgs }}
   {{- $package := . }}
   DEBIAN_FRONTEND=noninteractive $APT_PURGE {{ $package | squote }}