From 096729f990c0b0e576a59141ec33d63a5369cc0d Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 11 Jan 2022 07:18:44 +0100 Subject: [PATCH] remove openssh before building latest image to avoid error on aarch64 --- usr/bin/archboot-aarch64-release.sh | 4 ++-- usr/bin/archboot-x86_64-release.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/bin/archboot-aarch64-release.sh b/usr/bin/archboot-aarch64-release.sh index 11595d083..501026e11 100755 --- a/usr/bin/archboot-aarch64-release.sh +++ b/usr/bin/archboot-aarch64-release.sh @@ -32,8 +32,8 @@ systemd-nspawn -q -D "${W_DIR}" /bin/bash -c "umount /tmp;archboot-aarch64-iso.s # generate iso in container systemd-nspawn -q -D "${W_DIR}" /bin/bash -c "umount /tmp;archboot-aarch64-iso.sh -g -T=archrelease.tar" # remove not working lvm2 from latest image -echo "Remove lvm2 from container ${W_DIR} ..." -systemd-nspawn -D "${W_DIR}" /bin/bash -c "pacman -Rdd lvm2 --noconfirm" >/dev/null 2>&1 +echo "Remove lvm2 and openssh from container ${W_DIR} ..." +systemd-nspawn -D "${W_DIR}" /bin/bash -c "pacman -Rdd lvm2 openssh --noconfirm" >/dev/null 2>&1 # generate latest tarball in container echo "Generate latest ISO ..." systemd-nspawn -q -D "${W_DIR}" /bin/bash -c "umount /tmp;archboot-aarch64-iso.sh -t -i=latest -p="${_PRESET_LATEST}"" diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh index d7d700607..ced15795d 100755 --- a/usr/bin/archboot-x86_64-release.sh +++ b/usr/bin/archboot-x86_64-release.sh @@ -32,8 +32,8 @@ systemd-nspawn -q -D "${W_DIR}" /bin/bash -c "umount /tmp;archboot-x86_64-iso.sh # generate iso in container systemd-nspawn -q -D "${W_DIR}" /bin/bash -c "umount /tmp;archboot-x86_64-iso.sh -g -T=archrelease.tar" # remove not working lvm2 from latest image -echo "Remove lvm2 from container ${W_DIR} ..." -systemd-nspawn -D "${W_DIR}" /bin/bash -c "pacman -Rdd lvm2 --noconfirm" >/dev/null 2>&1 +echo "Remove lvm2 and openssh from container ${W_DIR} ..." +systemd-nspawn -D "${W_DIR}" /bin/bash -c "pacman -Rdd lvm2 openssh --noconfirm" >/dev/null 2>&1 # generate latest tarball in container echo "Generate latest ISO ..." systemd-nspawn -q -D "${W_DIR}" /bin/bash -c "umount /tmp;archboot-x86_64-iso.sh -t -i=latest -p="${_PRESET_LATEST}""