msw/CISS.debian.installer
SHA256
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m41s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-08-28 17:40:06 +02:00
parent 44b3d1fb60
commit d43638d262
10 changed files with 159 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
func/cdi_4000_debootstrap/4000_debootstrap.sh
View File

@@ -15,7 +15,6 @@ guard_sourcing
#######################################
# Install a minimal Debian environment using the 'debootstrap' command.
# Globals:
# ERR_DEBOOTSTRAP
# LOG_DBS
# TARGET
# VAR_ARCHITECTURE
@@ -37,7 +36,7 @@ func_debootstrap() {
declare -r var_includes="${debootstrap_includes}"
declare -a ary_cmd=()
ary_cmd+=( "debootstrap" "--arch=${var_arch}" "--merged-usr" )
ary_cmd+=( "debootstrap" "--arch=${var_arch}" "--log-extra-deps" "--merged-usr" )
if [[ -n "${var_includes}" ]]; then ary_cmd+=( "--include=${var_includes}" ); fi

8
func/cdi_4000_debootstrap/4005_check_usr_merge.sh
View File

@@ -30,16 +30,16 @@ check_usr_merge() {
# shellcheck disable=SC2312
chroot_script "${TARGET}" "
test -L /bin && test $(readlink -f /bin) = '/usr/bin' || echo 'UNMERGED:/bin' | tee -a ${var_logfile}
test -L /sbin && test $(readlink -f /sbin) = '/usr/sbin' || echo 'UNMERGED:/sbin' | tee -a ${var_logfile}
test -L /lib && test $(readlink -f /lib) = '/usr/lib' || echo 'UNMERGED:/lib' | tee -a ${var_logfile}
test -L /bin && test $(readlink -f /bin) = '/usr/bin' && echo 'MERGED:/bin' || echo 'UNMERGED:/bin' | tee -a ${var_logfile}
test -L /sbin && test $(readlink -f /sbin) = '/usr/sbin' && echo 'MERGED:/sbin' || echo 'UNMERGED:/sbin' | tee -a ${var_logfile}
test -L /lib && test $(readlink -f /lib) = '/usr/lib' && echo 'MERGED:/lib' || echo 'UNMERGED:/lib' | tee -a ${var_logfile}
echo ExitCode: \$? >> ${var_logfile}
"
if [[ "${architecture}" == "amd64" ]]; then
# shellcheck disable=SC2312
chroot_script "${TARGET}" "
test -L /lib64 && test $(readlink -f /lib64) = '/usr/lib64' || echo 'UNMERGED:/lib64' | tee -a ${var_logfile}
test -L /lib64 && test $(readlink -f /lib64) = '/usr/lib64' && echo 'MERGED:/lib64' || echo 'UNMERGED:/lib64' | tee -a ${var_logfile}
echo ExitCode: \$? >> ${var_logfile}
"
fi