From 71ee6a30018a9409340c73688a436e6695739388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Wed, 10 Feb 2021 21:15:18 +0100 Subject: [PATCH] Group arm64 specific overrides in the same if statement --- simple-cdd/simple-cdd.conf | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf index f12ff1d..c0e43e6 100644 --- a/simple-cdd/simple-cdd.conf +++ b/simple-cdd/simple-cdd.conf @@ -45,11 +45,7 @@ fi # Mirror tools mirror_tools="reprepro download" mirror_files="" # Don't try to download README doc/ tools/ -if [ "$ARCH" = "arm64" ]; then - require_optional_packages="false" -else - require_optional_packages="true" -fi +require_optional_packages="true" ignore_missing_checksums="true" # Mirror variables @@ -64,14 +60,16 @@ mirror_components="main contrib non-free" security_mirror="" updates_mirror="" -# Kernel related +# Kernel and architecture related if [ "$ARCH" = "i386" ]; then kernel_packages="linux-image-686-pae" fi if [ "$ARCH" = "arm64" ]; then kernel_packages="linux-image-arm64" -# ARM devices don't typically have a default console set, so we export one here + # ARM devices don't typically have a default console set, so we export one here export KERNEL_PARAMS="console=tty0 " + # Some packages are not available on arm64 + require_optional_packages="false" fi # Random other variables