From 3d2cfbc620458622deb386e458333d2fe312bd42 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Fri, 24 Feb 2023 18:49:18 +0800 Subject: [PATCH 1/2] use chroot_sdcard_apt_get_install for packages --- lib/functions/rootfs/rootfs-create.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/rootfs/rootfs-create.sh b/lib/functions/rootfs/rootfs-create.sh index df9d681986..612d14311f 100644 --- a/lib/functions/rootfs/rootfs-create.sh +++ b/lib/functions/rootfs/rootfs-create.sh @@ -175,7 +175,7 @@ function create_new_rootfs_cache_via_debootstrap() { # Then do the actual install. export if_error_detail_message="Installation of Armbian desktop packages for ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL} failed" - chroot_sdcard_apt_get install "${AGGREGATED_PACKAGES_DESKTOP[@]}" + chroot_sdcard_apt_get_install "${AGGREGATED_PACKAGES_DESKTOP[@]}" fi # stage: check md5 sum of installed packages. Just in case. @TODO: rpardini: this should also be done when a cache is used, not only when it is created From e6915eabc4c96ddee914c2c468fc8ed9123ffda1 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Fri, 24 Feb 2023 18:59:53 +0800 Subject: [PATCH 2/2] add shebang to rootfs-create.sh --- lib/functions/rootfs/rootfs-create.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/functions/rootfs/rootfs-create.sh b/lib/functions/rootfs/rootfs-create.sh index 612d14311f..ee09e2230e 100644 --- a/lib/functions/rootfs/rootfs-create.sh +++ b/lib/functions/rootfs/rootfs-create.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + function create_new_rootfs_cache_tarball() { # validate cache_fname is set [[ -n "${cache_fname}" ]] || exit_with_error "create_new_rootfs_cache_tarball: cache_fname is not set"