openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Install grep before busybox on suse distros"

This commit is contained in:
Zuul 2020-09-16 19:22:59 +00:00 committed by Gerrit Code Review
parent 3d4e8d749d 45688b20a2
commit 8eb20d2faf
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diskimage_builder/elements/zypper-minimal/root.d/08-zypper-chroot
View File

@ -100,6 +100,9 @@ sudo mount -t sysfs none $TARGET_ROOT/sys
# Install filesystem, base and useful tools
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 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