From 87aba7164e46ae8d425a538cd3cd447bc0979681 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Thu, 11 Jun 2015 18:08:52 +0200
Subject: [PATCH] Drop all occurrences of apt's --force-yes parameter

It only forces the installation of untrusted packages and that's
unwanted.

Closes: #776487
---
 bin/xen-update-image | 2 +-
 debian/changelog     | 3 +++
 hooks/common.sh      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/xen-update-image b/bin/xen-update-image
index eda6263..465a76d 100755
--- a/bin/xen-update-image
+++ b/bin/xen-update-image
@@ -302,7 +302,7 @@ sub updateXenImage
         #  Now upgrade
         #
         system(
-            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes --force-yes"
+            "DEBIAN_FRONTEND=noninteractive  chroot $tmp /usr/bin/apt-get upgrade --yes"
         );
 
         #
diff --git a/debian/changelog b/debian/changelog
index 9e8b356..647c0a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
   * Recommend debian-archive-keyring (for installing Debian DomUs on
     derivatives) and ubuntu-archive-keyring (for installing Ubuntu DomUs
     on Debian).
+  * Drop all occurrences of apt's --force-yes parameter. It only forces
+    the installation of untrusted packages and that's unwanted. (Closes:
+    #776487)
 
  -- Axel Beckert <abe@debian.org>  Fri, 09 Jan 2015 13:10:37 +0100
 
diff --git a/hooks/common.sh b/hooks/common.sh
index 02668ec..506cee0 100755
--- a/hooks/common.sh
+++ b/hooks/common.sh
@@ -96,7 +96,7 @@ installDebianPackageAndRecommends ()
     #
     # Install the packages
     #
-    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes install "$@"
+    DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes install "$@"
 
     #
     #  Remove the policy-rc.d script.