diff --git a/diskimage-create/README.rst b/diskimage-create/README.rst index 48390aa3af..65a39045c9 100644 --- a/diskimage-create/README.rst +++ b/diskimage-create/README.rst @@ -99,7 +99,7 @@ Command syntax: .. code-block:: $ diskimage-create.sh - [-a i386 | **amd64** | armhf | aarch64 | ppc64le ] + [-a **amd64** | armhf | aarch64 | ppc64le ] [-b **haproxy** ] [-c **~/.cache/image-create** | ] [-d **focal**/**9-stream**/**9** | ] diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index dbb165abce..566928c35b 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -20,7 +20,7 @@ set -e usage() { echo echo "Usage: $(basename "$0")" - echo " [-a i386 | **amd64** | armhf | aarch64 | ppc64le]" + echo " [-a **amd64** | armhf | aarch64 | ppc64le]" echo " [-b **haproxy** ]" echo " [-c **~/.cache/image-create** | ]" echo " [-d **focal**/**9-stream**/**9** | ]" @@ -96,8 +96,7 @@ while getopts "a:b:c:d:efg:hi:k:l:no:pt:r:s:vw:xy" opt; do case $opt in a) AMP_ARCH=$OPTARG - if [ "$AMP_ARCH" != "i386" ] && \ - [ "$AMP_ARCH" != "amd64" ] && \ + if [ "$AMP_ARCH" != "amd64" ] && \ [ "$AMP_ARCH" != "ppc64le" ] && \ [ "$AMP_ARCH" != "aarch64" ] && \ [ "$AMP_ARCH" != "armhf" ]; then diff --git a/elements/amphora-agent/package-installs.yaml b/elements/amphora-agent/package-installs.yaml index b7e75bde13..765a686e14 100644 --- a/elements/amphora-agent/package-installs.yaml +++ b/elements/amphora-agent/package-installs.yaml @@ -21,7 +21,7 @@ acl: acpid-ppc64le: arch: ppc64le, ppc64el acpid: - arch: i386, amd64, aarch64, arm64, s390x + arch: amd64, aarch64, arm64, s390x apparmor: apt-transport-https: at: @@ -49,7 +49,7 @@ netbase: netcat-openbsd: network-scripts: open-vm-tools: - arch: i386, amd64 + arch: amd64 openssh-client: openssh-server: pollinate: