live-bootstrap

commit: 38b90d6a9665449d9140ecbc344efe3021515d5a
parent b285bc93b6fd138ac5864e5c90a008759f157de0
Author: fosslinux <fosslinux@aussies.space>
Date:   Mon,  3 Oct 2022 09:39:25 +1100

Make preseed work in sysc

- TODO: tar-1.34 does not work properly with preseed.

Diffstat:
M
sysa/helpers.sh
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sysa/helpers.sh b/sysa/helpers.sh
@@ -107,6 +107,7 @@ bin_preseed() {
                 mv -- *-repodata ../repo
             fi
             cd "${SRCDIR}/repo"
+            rm -f /tmp/filelist.txt
             src_apply "${pkg}" $((revision))
             cd "${SOURCES}"
             return 0
@@ -128,7 +129,7 @@ build() {
     script_name=${2:-${pkg}.sh}
     dirname=${4:-${pkg}}
 
-    bin_preseed && return
+    bin_preseed && return || true # Normal build if preseed fails
 
     cd "${SOURCES}/${pkg}" || (echo "Cannot cd into ${pkg}!"; kill $$)
     echo "${pkg}: beginning build using script ${script_name}"
@@ -472,6 +473,9 @@ sys_transfer() {
     cp -r "${sys_sources}/"* "${dest}/${PREFIX}/src"
     cp -f "${sys_sources}/init" "${dest}/"
     cp -r "${PREFIX}/src/repo" "${dest}/${PREFIX}/src"
+    if [ -e "${PREFIX}/src/repo-preseeded" ]; then
+        cp -r "${PREFIX}/src/repo-preseeded" "${dest}/${PREFIX}/src"
+    fi
 
     shift 2
     # Copy additional binaries