V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 45s
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 45s
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -32,7 +32,7 @@ configure_system() {
|
||||
# Conversely, changes to the target mount are not propagated back to the source mount.
|
||||
# This mode is necessary to avoid problems with double or erroneous propagation effects in chroot or container environments.
|
||||
|
||||
declare var_src var_dst
|
||||
declare var_src="" var_dst=""
|
||||
declare -a ary_mounts=(proc sys dev run)
|
||||
|
||||
for var_src in "${ary_mounts[@]}"; do
|
||||
@@ -52,7 +52,7 @@ configure_system() {
|
||||
return "${ERR_CHRT_MOUNTS}"
|
||||
fi
|
||||
|
||||
do_log "info" "file_only" "4020() Command: [mkdir -p /etc/systemd/system/multi-user.target.wants] successful in: '${TARGET}'."
|
||||
do_log "info" "file_only" "4020() Command: [mkdir -p /etc/systemd/system/multi-user.target.wants] failed in: '${TARGET}'."
|
||||
|
||||
declare -gx VAR_CHROOT_ACTIVATED="system"
|
||||
|
||||
|
||||
@@ -17,36 +17,52 @@ guard_sourcing
|
||||
# Globals:
|
||||
# TARGET
|
||||
# Arguments:
|
||||
# 1: UUID
|
||||
# 1: UUID or /dev/mapper
|
||||
# 2: Mount Path
|
||||
# 3: Filesystem
|
||||
# 4: Mount Options
|
||||
# 5: Pass value, while Dump value is hardcoded always "0", e.g., "1"
|
||||
# 5: Pass value, while Dump value is hardcoded always "0".
|
||||
# Returns:
|
||||
# 0: on success
|
||||
#######################################
|
||||
write_fstab() {
|
||||
declare write_uuid="$1" write_path="$2" write_type="$3" write_opts="$4" write_pass="$5"
|
||||
printf "%-43s%-28s%-8s%-74s0 %s\n" "UUID=${write_uuid}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab"
|
||||
do_log "info" "file_only" "4040() fstab entry generated: [UUID=${write_uuid} ${write_path} ${write_type} ${write_opts} 0 ${write_pass}]."
|
||||
declare write_maps="$1" write_path="$2" write_type="$3" write_opts="$4" write_pass="$5"
|
||||
|
||||
if [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then
|
||||
|
||||
printf "%-43s%-28s%-8s%-74s0 %s\n" "UUID=${write_maps}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab"
|
||||
do_log "info" "file_only" "4040() fstab entry generated: [UUID=${write_maps} ${write_path} ${write_type} ${write_opts} 0 ${write_pass}]."
|
||||
|
||||
elif [[ "${write_maps}" == /dev/mapper/* ]]; then
|
||||
|
||||
printf "%-43s%-28s%-8s%-74s0 %s\n" "${write_maps}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab"
|
||||
do_log "info" "file_only" "4040() fstab entry generated: [${write_maps} ${write_path} ${write_type} ${write_opts} 0 ${write_pass}]."
|
||||
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Generate target '/etc/fstab' entries.
|
||||
# Globals:
|
||||
# ARY_PATHS_SORTED
|
||||
# DIR_LOG
|
||||
# HMP_EPHEMERAL_ENCLABEL
|
||||
# HMP_FSTAB_MOUNT_FTYPE
|
||||
# HMP_FSTAB_MOUNT_OPTS
|
||||
# HMP_PATH_FSUUID
|
||||
# MAP_MOUNTPATH_DEV
|
||||
# TARGET
|
||||
# VAR_RECIPE_STRING
|
||||
# VAR_SETUP_PART
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# 0: on success
|
||||
#######################################
|
||||
generate_fstab() {
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
declare var_path="" var_dmapper="" var_fs_uuid="" var_fs_path="" var_fs_type="" var_fs_opts="" var_fs_pass=""
|
||||
declare -i rc=0
|
||||
|
||||
### Generate '${TARGET}/etc/fstab' header.
|
||||
: >| "${TARGET}/etc/fstab"
|
||||
chmod 0600 "${TARGET}/etc/fstab"
|
||||
@@ -73,7 +89,6 @@ generate_fstab() {
|
||||
#
|
||||
# <file system UUID> <mount point> <type> <options> <dump> <pass>
|
||||
|
||||
|
||||
### Secure tmpfs mounts for a hardened system
|
||||
|
||||
# Mount the proc filesystem to provide process and kernel information
|
||||
@@ -89,157 +104,92 @@ tmpfs /run tmpfs m
|
||||
|
||||
EOF
|
||||
|
||||
### Generate '${TARGET}/etc/fstab' special entries '/' '/boot' '/boot/efi'.
|
||||
### Define the order of the special paths.
|
||||
declare -a ary_path_order=("/" "/boot" "/boot/efi")
|
||||
declare -a ary_skip=("/" "/boot" "/boot/efi" "/recovery")
|
||||
declare var_path="" var_fs_uuid="" var_fs_path="" var_fs_type="" var_fs_opts=""
|
||||
### Generate dynamic '${TARGET}/etc/fstab' entries.
|
||||
for var_path in "${ARY_PATHS_SORTED[@]}"; do
|
||||
|
||||
for var_path in "${ary_path_order[@]}"; do
|
||||
case "${var_path,,}" in
|
||||
|
||||
var_fs_uuid="${HMP_PATH_FSUUID["${var_path}"]}"
|
||||
var_fs_path="${var_path}"
|
||||
var_fs_type="${HMP_FSTAB_MOUNT_FTYPE["${var_path}"]}"
|
||||
var_fs_opts="${HMP_FSTAB_MOUNT_OPTS["${var_path}"]}"
|
||||
swap)
|
||||
|
||||
var_dmapper="${HMP_EPHEMERAL_ENCLABEL["${var_path}"]}"
|
||||
var_fs_uuid="/dev/mapper/${var_dmapper}"
|
||||
var_fs_path="none"
|
||||
var_fs_type="swap"
|
||||
var_fs_opts="defaults"
|
||||
var_fs_pass="0"
|
||||
;;
|
||||
|
||||
done
|
||||
/tmp)
|
||||
|
||||
declare var_path var_entry var_part var_dev var_key var_uuid var_fs_btrfs_compress var_fs_btrfs_level var_fs_btrfs_subvolume \
|
||||
var_fs_version var_mount_options var_mount_optsnap var_btrfs_compression
|
||||
var_dmapper="${HMP_EPHEMERAL_ENCLABEL["${var_path}"]}"
|
||||
var_fs_uuid="/dev/mapper/${var_dmapper}"
|
||||
var_fs_path="${var_path}"
|
||||
var_fs_type="${HMP_FSTAB_MOUNT_FTYPE["${var_path}"]}"
|
||||
var_fs_opts="${HMP_FSTAB_MOUNT_OPTS["${var_path}"]}"
|
||||
var_fs_pass="0"
|
||||
;;
|
||||
|
||||
for var_path in "${ary_path_order[@]}"; do
|
||||
*)
|
||||
|
||||
var_entry=$(yq e -r '.recipe.*.dev.* | select(.mount.path == "'"${var_path}"'")' "${VAR_SETUP_PART}")
|
||||
var_fs_uuid="${HMP_PATH_FSUUID["${var_path}"]}"
|
||||
var_fs_path="${var_path}"
|
||||
var_fs_type="${HMP_FSTAB_MOUNT_FTYPE["${var_path}"]}"
|
||||
var_fs_opts="${HMP_FSTAB_MOUNT_OPTS["${var_path}"]}"
|
||||
case "${var_path,,}" in
|
||||
/) var_fs_pass="1" ;;
|
||||
/boot/efi) var_fs_pass="0" ;;
|
||||
*) var_fs_pass="2" ;;
|
||||
esac
|
||||
;;
|
||||
|
||||
if [[ -z "${var_entry}" ]]; then
|
||||
continue
|
||||
fi
|
||||
esac
|
||||
|
||||
case "${var_fs_type,,}" in
|
||||
|
||||
btrfs)
|
||||
|
||||
|
||||
var_part=$(echo "${var_entry}" | yq e 'path | .[-2]' -)
|
||||
var_dev=$(echo "${var_entry}" | yq e 'path | .[-3]' -)
|
||||
var_key="UUID_${var_path}"
|
||||
var_uuid="${HMP_PATH_FSUUID[${var_key}]}"
|
||||
var_fs_btrfs_compress=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.compress" "${VAR_SETUP_PART}")
|
||||
var_fs_btrfs_level=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.level" "${VAR_SETUP_PART}")
|
||||
var_fs_btrfs_subvolume=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.subvolume" "${VAR_SETUP_PART}")
|
||||
var_fs_version=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version" "${VAR_SETUP_PART}")
|
||||
var_mount_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.options" "${VAR_SETUP_PART}")
|
||||
var_mount_optsnap=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.optsnap" "${VAR_SETUP_PART}")
|
||||
|
||||
if [[ "${var_fs_version,,}" == btrfs ]]; then
|
||||
|
||||
if [[ "${var_fs_btrfs_level:-0}" == 0 ]]; then
|
||||
var_btrfs_compression="compress=no"
|
||||
else
|
||||
var_btrfs_compression="compress=${var_fs_btrfs_compress}:${var_fs_btrfs_level}"
|
||||
fi
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}" "${var_fs_version}" "${var_mount_options},${var_btrfs_compression}" "1"
|
||||
|
||||
if [[ -n "${var_fs_btrfs_subvolume}" ]]; then
|
||||
|
||||
if [[ "${var_path}" == "/" ]]; then
|
||||
|
||||
write_fstab "${var_uuid}" "/.snapshots" "${var_fs_version}" "${var_mount_optsnap}" "0"
|
||||
|
||||
else
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}/.snapshots" "${var_fs_version}" "${var_mount_optsnap}" "0"
|
||||
|
||||
write_fstab "${var_fs_uuid}" "${var_fs_path}" "${var_fs_type}" "${var_fs_opts}" "${var_fs_pass}"
|
||||
if [[ -v HMP_FSTAB_MOUNT_OPTS["${var_path}/.snapshots"] ]]; then
|
||||
var_fs_opts="${HMP_FSTAB_MOUNT_OPTS["${var_path}/.snapshots"]}"
|
||||
write_fstab "${var_fs_uuid}" "${var_fs_path}/.snapshots" "${var_fs_type}" "${var_fs_opts}" "${var_fs_pass}"
|
||||
fi
|
||||
continue
|
||||
;;
|
||||
|
||||
fi
|
||||
continue
|
||||
ext4)
|
||||
|
||||
elif [[ "${var_fs_version,,}" == ext4 ]]; then
|
||||
write_fstab "${var_fs_uuid}" "${var_fs_path}" "${var_fs_type}" "${var_fs_opts}" "${var_fs_pass}"
|
||||
continue
|
||||
;;
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}" "${var_fs_version}" "${var_mount_options}" "1"
|
||||
continue
|
||||
fat32)
|
||||
|
||||
elif [[ "${var_fs_version,,}" == fat32 ]]; then
|
||||
write_fstab "${var_fs_uuid}" "${var_fs_path}" "vfat" "${var_fs_opts}" "${var_fs_pass}"
|
||||
continue
|
||||
;;
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}" "vfat" "${var_mount_options}" "2"
|
||||
continue
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
for var_path in "${ARY_FSTAB_MOUNT_PATHS[@]}"; do
|
||||
:
|
||||
done
|
||||
### Generate '${TARGET}/etc/fstab' remaining entries.
|
||||
for var_path in "${!MAP_MOUNTPATH_DEV[@]}"; do
|
||||
|
||||
if validation_array "${var_path}" "${ary_skip[@]}"; then
|
||||
continue
|
||||
fi
|
||||
|
||||
var_entry=$(yq e -r '.recipe.*.dev.* | select(.mount.path == "'"${var_path}"'")' "${VAR_SETUP_PART}")
|
||||
|
||||
if [[ -z "${var_entry}" ]]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
var_part=$(echo "${var_entry}" | yq e 'path | .[-2]' -)
|
||||
var_dev=$(echo "${var_entry}" | yq e 'path | .[-3]' -)
|
||||
var_key="UUID_${var_path}"
|
||||
var_uuid="${HMP_PATH_FSUUID[${var_key}]}"
|
||||
var_fs_btrfs_compress=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.compress" "${VAR_SETUP_PART}")
|
||||
var_fs_btrfs_level=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.level" "${VAR_SETUP_PART}")
|
||||
var_fs_btrfs_subvolume=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.btrfs.subvolume" "${VAR_SETUP_PART}")
|
||||
var_fs_version=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.filesystem.version" "${VAR_SETUP_PART}")
|
||||
var_mount_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.options" "${VAR_SETUP_PART}")
|
||||
var_mount_optsnap=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev}.${var_part}.mount.optsnap" "${VAR_SETUP_PART}")
|
||||
|
||||
if [[ "${var_fs_version,,}" == btrfs ]]; then
|
||||
|
||||
if [[ "${var_fs_btrfs_level:-0}" == 0 ]]; then
|
||||
var_btrfs_compression="compress=no"
|
||||
else
|
||||
var_btrfs_compression="compress=${var_fs_btrfs_compress}:${var_fs_btrfs_level}"
|
||||
fi
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}" "${var_fs_version}" "${var_mount_options},${var_btrfs_compression}" "2"
|
||||
|
||||
if [[ -n "${var_fs_btrfs_subvolume}" ]]; then
|
||||
write_fstab "${var_uuid}" "${var_path}/.snapshots" "${var_fs_version}" "${var_mount_optsnap}" "0"
|
||||
fi
|
||||
continue
|
||||
|
||||
elif [[ "${var_fs_version,,}" == ext4 ]]; then
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}" "${var_fs_version}" "${var_mount_options}" "2"
|
||||
continue
|
||||
|
||||
elif [[ "${var_fs_version,,}" == fat32 ]]; then
|
||||
|
||||
write_fstab "${var_uuid}" "${var_path}" "vfat" "${var_mount_options}" "2"
|
||||
continue
|
||||
|
||||
fi
|
||||
esac
|
||||
|
||||
done
|
||||
|
||||
cat << 'EOF' >> "${TARGET}/etc/fstab"
|
||||
|
||||
/dev/sr0 /media/cdrom0 udf,iso9660 user,noauto 0 0
|
||||
/dev/sr0 /media/cdrom0 udf,iso9660 user,noauto 0 0
|
||||
|
||||
EOF
|
||||
do_log "info" "file_only" "fstab entry generated: '/dev/sr0 /media/cdrom0 udf,iso9660 user,noauto 0 0'."
|
||||
|
||||
### Add entry for 'SWAP' device.
|
||||
var_path="SWAP"
|
||||
write_fstab "/dev/mapper/${HMP_EPHEMERAL_ENCLABEL["${var_path}"]}" "none" "swap" "defaults" "0"
|
||||
: >| "${DIR_LOG}/fstab.verify.log"
|
||||
chmod 0600 "${DIR_LOG}/fstab.verify.log"
|
||||
|
||||
### Add entry for '/tmp' device.
|
||||
var_path="/tmp"
|
||||
write_fstab "/dev/mapper/${HMP_EPHEMERAL_ENCLABEL["${var_path}"]}" "/tmp" "ext4" "defaults,rw,nodev,nosuid,relatime" "0"
|
||||
do_in_target_script "${TARGET}" 'systemd-analyze verify /etc/fstab' >> "${DIR_LOG}/fstab.verify.log" 2>&1
|
||||
rc="$?"
|
||||
|
||||
if (( rc == 0 )); then
|
||||
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
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -25,9 +25,9 @@ guard_sourcing
|
||||
# 0: on success
|
||||
#######################################
|
||||
write_crypttab() {
|
||||
declare _label="$1" _device="$2" _key_file="$3" _opts="$4"
|
||||
printf "%s %s %s %s\n" "${_label}" "${_device}" "${_key_file}" "${_opts}" >> "${TARGET}/etc/crypttab"
|
||||
do_log "info" "file_only" "4060() crypttab entry generated: [${_label} ${_device} ${_key_file} ${_opts}]."
|
||||
declare write_label="$1" write_dev="$2" write_key_file="$3" write_opts="$4"
|
||||
printf "%-43s %-45s %-29s %s\n" "${write_label}" "${write_dev}" "${write_key_file}" "${write_opts}" >> "${TARGET}/etc/crypttab"
|
||||
do_log "info" "file_only" "4060() crypttab entry generated: [${write_label} ${write_dev} ${write_key_file} ${write_opts}]."
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -35,8 +35,8 @@ write_crypttab() {
|
||||
# Generate target '/etc/crypttab' entries.
|
||||
# Globals:
|
||||
# HMP_EPHEMERAL_ENCLABEL
|
||||
# HMP_EPHEMERAL_FS_LABEL
|
||||
# HMP_PATH_ENCLABEL
|
||||
# HMP_PATH_FSUUID
|
||||
# HMP_PATH_LUKSUUID
|
||||
# TARGET
|
||||
# VAR_NUKE
|
||||
@@ -47,10 +47,10 @@ write_crypttab() {
|
||||
# 0: on success
|
||||
#######################################
|
||||
generate_crypttab() {
|
||||
declare var_key var_encryption_label var_luks_uuid
|
||||
### Declare Arrays, HashMaps, and Variables.
|
||||
declare var_key="" var_encryption_label="" var_luks_uuid="" var_ephemeral_enclabel="" var_host_uuid=""
|
||||
|
||||
### Generate '${TARGET}/etc/crypttab' header.
|
||||
install -d -m 0755 "${TARGET}/etc"
|
||||
: >| "${TARGET}/etc/crypttab"
|
||||
chmod 0600 "${TARGET}/etc/crypttab"
|
||||
|
||||
@@ -66,7 +66,7 @@ generate_crypttab() {
|
||||
# SPDX-PackageName: CISS.debian.installer
|
||||
# SPDX-Security-Contact: security@coresecret.eu
|
||||
|
||||
# /etc/crypttab: static file system information.
|
||||
# Static file system information: '/etc/crypttab'.
|
||||
#
|
||||
# Basic rule: 'discard' / 'nodiscard' are normally only set in '/etc/crypttab' when LUKS/dm-crypt is in use. Options like
|
||||
# 'discard=async' or similar are typically only set in '/etc/fstab' (at the file system level). The crypttab determines whether
|
||||
@@ -77,13 +77,11 @@ generate_crypttab() {
|
||||
# not specify discard in the '/etc/crypttab', dm-crypt blocks TRIM by default. This would render a discard in the '/etc/fstab'
|
||||
# ineffective.
|
||||
#
|
||||
# <name> <device> <password-file-or-none> <options>
|
||||
# <name> <device> <password-file-or-none> <options>
|
||||
|
||||
EOF
|
||||
|
||||
### Generate '${TARGET}/etc/crypttab' entries.
|
||||
declare var_ephemeral_enclabel var_ephemeral_fs_label
|
||||
|
||||
for var_key in "${!HMP_PATH_LUKSUUID[@]}"; do
|
||||
|
||||
var_encryption_label="${HMP_PATH_ENCLABEL["${var_key}"]}"
|
||||
@@ -112,14 +110,14 @@ EOF
|
||||
for var_key in "${!HMP_EPHEMERAL_ENCLABEL[@]}"; do
|
||||
|
||||
var_ephemeral_enclabel="${HMP_EPHEMERAL_ENCLABEL["${var_key}"]}"
|
||||
var_ephemeral_fs_label="${HMP_EPHEMERAL_FS_LABEL["${var_key}"]}"
|
||||
var_host_uuid="${HMP_PATH_FSUUID["${var_key}"]}"
|
||||
|
||||
case "${var_key}" in
|
||||
SWAP)
|
||||
write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_ephemeral_fs_label}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096"
|
||||
write_crypttab "${var_ephemeral_enclabel}" "UUID=${var_host_uuid}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096"
|
||||
;;
|
||||
/tmp)
|
||||
write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_ephemeral_fs_label}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,tmp=ext4"
|
||||
write_crypttab "${var_ephemeral_enclabel}" "UUID=${var_host_uuid}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,tmp=ext4"
|
||||
;;
|
||||
*)
|
||||
do_log "error" "file_only" "Only 'SWAP' and '/tmp' are valid Partitions for Ephemeral Encryption. Given value was: '${var_key}'."
|
||||
|
||||
Reference in New Issue
Block a user