From c091227f4edf9f64d47537a18a2fc54e1721df78 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 14 Sep 2020 16:00:47 -0700
Subject: [PATCH] Install gzip instead of busybox-gzip on suse

e2fsprogs pulls in info which needs gzip. But that conflicts with the
preexisting busybox-gzip. Install normal gzip to ensure that things can
proceed without conflict.

Change-Id: I3bed5bc141eaa0f3a15bfbf9da3e2d6e7c964a76
---
 .../elements/zypper-minimal/root.d/08-zypper-chroot            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot b/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
index 0cbf4869e..4a75bba4b 100755
--- a/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
+++ b/diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
@@ -103,6 +103,9 @@ sudo zypper ${ZYPPER_TARGET_OPTS} install --no-recommends filesystem
 # Install grep before base to avoid pulling in busybox-grep as it conflicts
 # with rsync installation
 sudo zypper ${ZYPPER_TARGET_OPTS} install --no-recommends grep
+# Install gzip before base to avoid pulling in busybox-gzip as it conflicts
+# with info installation
+sudo zypper ${ZYPPER_TARGET_OPTS} install --no-recommends gzip
 # Install xz before base to avoid pulling in busybox-xz
 # https://bugzilla.opensuse.org/show_bug.cgi?id=1172209
 sudo zypper ${ZYPPER_TARGET_OPTS} install --no-recommends xz