From 3a808a8d23f4926a9b5d4f409b30d11e59b09ac3 Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Wed, 11 Sep 2019 14:39:00 -0700 Subject: [PATCH 1/3] Adding arch support for busybox --- base/redhat-8/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh index e06013d0..8d97ffdb 100755 --- a/base/redhat-8/install.sh +++ b/base/redhat-8/install.sh @@ -16,6 +16,7 @@ set -e # reinstalling local en def for now, removed in minimal image https://bugzilla.redhat.com/show_bug.cgi?id=1665251 +microdnf -y update microdnf -y --nodocs install glibc-langpack-en #Currently there is no access to the UTF-8 char map, the following command is commented out until @@ -27,8 +28,7 @@ export LANG=en_US.utf8 microdnf -y --nodocs install wget sudo shadow-utils procps #install busybox direct from the multiarch since epel isn't availible yet for redhat8 -wget https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-x86_64 -mv busybox-x86_64 /bin/busybox +wget -O /bin/busybox https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-`arch` chmod +x /bin/busybox microdnf -y --nodocs install python2 tar pip2 -q --no-cache-dir install requests ansible From 397525205795b6035840e9a454d00c4f2e806ced Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Wed, 11 Sep 2019 16:00:03 -0700 Subject: [PATCH 2/3] Fixing libs --- base/redhat-8/install.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh index 8d97ffdb..506e0962 100755 --- a/base/redhat-8/install.sh +++ b/base/redhat-8/install.sh @@ -30,21 +30,24 @@ microdnf -y --nodocs install wget sudo shadow-utils procps #install busybox direct from the multiarch since epel isn't availible yet for redhat8 wget -O /bin/busybox https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-`arch` chmod +x /bin/busybox -microdnf -y --nodocs install python2 tar +microdnf -y --nodocs install gcc redhat-rpm-config python2-devel libffi-devel openssl-devel tar +pip2 install --upgrade pip pip2 -q --no-cache-dir install requests ansible cd /bin -ln -s busybox diff -ln -s busybox hostname -ln -s busybox killall -ln -s busybox netstat -ln -s busybox nslookup -ln -s busybox ping -ln -s busybox ping6 -ln -s busybox readline -ln -s busybox route -ln -s busybox syslogd -ln -s busybox traceroute +ln -s python2 python || true +python -V +ln -s busybox diff || true +ln -s busybox hostname || true +ln -s busybox killall || true +ln -s busybox netstat || true +ln -s busybox nslookup || true +ln -s busybox ping || true +ln -s busybox ping6 || true +ln -s busybox readline || true +ln -s busybox route || true +ln -s busybox syslogd || true +ln -s busybox traceroute || true chmod u+s /bin/ping groupadd sudo From 0e4d655d5086a11d4f7c81427684be9f0041f111 Mon Sep 17 00:00:00 2001 From: Nelson Wang Date: Tue, 24 Sep 2019 15:01:15 -0700 Subject: [PATCH 3/3] Removing unnecessary packages --- base/redhat-8/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh index 506e0962..f44c8ffb 100755 --- a/base/redhat-8/install.sh +++ b/base/redhat-8/install.sh @@ -31,12 +31,12 @@ microdnf -y --nodocs install wget sudo shadow-utils procps wget -O /bin/busybox https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-`arch` chmod +x /bin/busybox microdnf -y --nodocs install gcc redhat-rpm-config python2-devel libffi-devel openssl-devel tar -pip2 install --upgrade pip -pip2 -q --no-cache-dir install requests ansible +pip2 --no-cache-dir install requests ansible +microdnf -y remove gcc libffi-devel openssl-devel +microdnf clean all cd /bin ln -s python2 python || true -python -V ln -s busybox diff || true ln -s busybox hostname || true ln -s busybox killall || true