V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 51s

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-08-08 10:05:08 +02:00
parent 7e1345c7ec
commit e3c038017c
5 changed files with 17 additions and 24 deletions

View File

@@ -148,8 +148,8 @@ color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: PREPARING DIRECTORIES AN
gen_dir_files gen_dir_files
### CHECKING REQUIRED PACKAGES. ### CHECKING REQUIRED PACKAGES.
color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECKING REQUIRED PACKAGES ..." #color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECKING REQUIRED PACKAGES ..."
check_pkgs #check_pkgs
color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECKING GIT VARIABLES ..." color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECKING GIT VARIABLES ..."
check_git check_git
@@ -268,6 +268,8 @@ installation_chrony
### CDI_4200 ### CDI_4200
echo "MAIN PROGRAM SEQUENCE: 4200_generate_fstab.sh ..." echo "MAIN PROGRAM SEQUENCE: 4200_generate_fstab.sh ..."
generate_fstab generate_fstab
#echo "MAIN PROGRAM SEQUENCE: 4205_check_fstab.sh ..."
#check_fstab
echo "MAIN PROGRAM SEQUENCE: 4210_generate_crypttab.sh ..." echo "MAIN PROGRAM SEQUENCE: 4210_generate_crypttab.sh ..."
generate_crypttab generate_crypttab
echo "MAIN PROGRAM SEQUENCE: 4220_installation_cryptsetup.sh ..." echo "MAIN PROGRAM SEQUENCE: 4220_installation_cryptsetup.sh ..."
@@ -308,7 +310,7 @@ echo "MAIN PROGRAM SEQUENCE: 4500_installation_accounts.sh ..."
installation_accounts installation_accounts
### CDI_4600 ### CDI_4600
#echo "MAIN PROGRAM SEQUENCE: 4600_minimal_checks.sh ..." #echo "MAIN PROGRAM SEQUENCE: 4205_check_fstab.sh ..."
#echo "MAIN PROGRAM SEQUENCE: 4610_finalize_system.sh ..." #echo "MAIN PROGRAM SEQUENCE: 4610_finalize_system.sh ..."

View File

@@ -13,7 +13,7 @@
guard_sourcing guard_sourcing
####################################### #######################################
# TODO: Implement this function # Basic /etc/fstab checks inside chroot.
# Globals: # Globals:
# TARGET # TARGET
# Arguments: # Arguments:
@@ -21,24 +21,17 @@ guard_sourcing
# Returns: # Returns:
# 0: on success # 0: on success
####################################### #######################################
minimal_checks() { check_fstab() {
declare var_bin ### Declare Arrays, HashMaps, and Variables.
declare -r var_logfile="/root/.ciss/cdi/log/4205_check_fstab.log"
: >| "${DIR_LOG}/fstab.verify.log" touch "${TARGET}${var_logfile}" && chmod 0600 "${TARGET}${var_logfile}"
chmod 0600 "${DIR_LOG}/fstab.verify.log"
do_in_target_script "${TARGET}" "systemd-analyze verify /etc/fstab >> ${DIR_LOG}/fstab.verify.log 2>&1" do_in_target_script "${TARGET}" '
rc="$?" export INITRD=No
systemd-analyze verify /etc/fstab 2>&1 | tee -a '"${var_logfile}"'
if (( rc == 0 )); then echo ExitCode: $? >> '"${var_logfile}"'
'
do_log "info" "file_only" "4040() '/etc/fstab' verified successfully with systemd-analyze."
else
do_log "warning" "file_only" "4040() '/etc/fstab' verification returned errors, see '${DIR_LOG}/fstab.verify.log'."
fi
guard_dir && return 0 guard_dir && return 0
} }

View File

@@ -36,8 +36,6 @@ installation_cryptsetup() {
echo ExitCode: $? >> '"${var_logfile}"' echo ExitCode: $? >> '"${var_logfile}"'
' '
do_log "info" "file_only" "4220() Installation [cryptsetup cryptsetup-initramfs] successful."
guard_dir && return 0 guard_dir && return 0
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -90,7 +90,7 @@ dropbear_setup() {
"${TARGET}/etc/initramfs-tools/hooks/" "${TARGET}/etc/initramfs-tools/hooks/"
### Install the script to be called inside initramfs environment for unlocking LUKS and NUKE Devices. ### Install the script to be called inside initramfs environment for unlocking LUKS and NUKE Devices.
install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/files/unlock-wrapper.sh" \ install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/files/unlock_wrapper.sh" \
"${TARGET}/etc/initramfs-tools/files/" "${TARGET}/etc/initramfs-tools/files/"
### Install the script to be called inside the Host environment for signing 'unlock_wrapper.sh'-script. ### Install the script to be called inside the Host environment for signing 'unlock_wrapper.sh'-script.

View File

@@ -60,6 +60,7 @@ source_guard "./func/cdi_4100_base/4150_installation_chrony.sh"
### cdi_4200_boot_installation ### cdi_4200_boot_installation
source_guard "./func/cdi_4200_boot/4200_generate_fstab.sh" source_guard "./func/cdi_4200_boot/4200_generate_fstab.sh"
source_guard "./func/cdi_4200_boot/4205_check_fstab.sh"
source_guard "./func/cdi_4200_boot/4210_generate_crypttab.sh" source_guard "./func/cdi_4200_boot/4210_generate_crypttab.sh"
source_guard "./func/cdi_4200_boot/4220_installation_cryptsetup.sh" source_guard "./func/cdi_4200_boot/4220_installation_cryptsetup.sh"
source_guard "./func/cdi_4200_boot/4230_installation_grub.sh" source_guard "./func/cdi_4200_boot/4230_installation_grub.sh"
@@ -84,7 +85,6 @@ source_guard "./func/cdi_4400_hardening/4440_hardening_files.sh"
source_guard "./func/cdi_4500_user/4500_installation_accounts.sh" source_guard "./func/cdi_4500_user/4500_installation_accounts.sh"
### cdi_4600_verification ### cdi_4600_verification
#source_guard "./func/cdi_4600_verification/4600_minimal_checks.sh"
#source_guard "./func/cdi_4600_verification/4610_finalize_system.sh" #source_guard "./func/cdi_4600_verification/4610_finalize_system.sh"
#source_guard "./func/cdi_4600_verification/4670_verify_system.sh" #source_guard "./func/cdi_4600_verification/4670_verify_system.sh"
#source_guard "./func/cdi_4600_verification/4680_check_sshd_config_integrity.sh" #source_guard "./func/cdi_4600_verification/4680_check_sshd_config_integrity.sh"