Do not setup containers on non-RISCVServer image

Same as in previous commit. This showed up while building default cloud
image. We need a better way to solve this later on.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-12-04 13:24:31 +02:00
parent 5234af45ee
commit 48be60f4b2
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3

View File

@ -341,15 +341,6 @@ enabled=0
gpgcheck=0
EOF
if [[ "$kiwi_profiles" == *"RISCVServer"* ]]; then
# Disable tmpfs for /tmp
# Most boards don't have a lot of RAM.
systemctl mask tmp.mount
# We most likely don't have HW random number generator
systemctl enable haveged.service
fi
# Update login message
cat << EOF | tee /etc/issue /etc/issue.net
Welcome to the Fedora/RISC-V disk image
@ -376,6 +367,14 @@ Koji internal rep.: http://fedora.riscv.rocks/repos/
EOF
if [[ "$kiwi_profiles" == *"RISCVServer"* ]]; then
# Disable tmpfs for /tmp
# Most boards don't have a lot of RAM.
systemctl mask tmp.mount
# We most likely don't have HW random number generator
systemctl enable haveged.service
# Setup toolbox container to use
cat << EOF | tee -a /etc/containers/toolbox.conf
image = "fedora.riscv.rocks:3000/davidlt/fedora-toolbox:41"
@ -390,8 +389,7 @@ EOF
# Add Fedora/RISCV registry for search
sed -i -r 's/(unqualified-search-registries = \[")/\1fedora.riscv.rocks:3000", "/' /etc/containers/registries.conf
fi # RISCVServer
fi
exit 0