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 53s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-07-30 09:52:03 +02:00
parent 5af9f25f69
commit a79603b40a
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
func/partitioning/3280_mount_partition.sh
View File

@@ -172,7 +172,10 @@ mount_partition() {
var_mount_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.mount.options" "${VAR_SETUP_PART}") var_mount_options=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.mount.options" "${VAR_SETUP_PART}")
var_mount_optsnap=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.mount.optsnap" "${VAR_SETUP_PART}") var_mount_optsnap=$(yq_val ".recipe.${VAR_RECIPE_STRING}.dev.${var_dev_part}.mount.optsnap" "${VAR_SETUP_PART}")
var_encryption_label=$(get_label "${var_mount_path}" "${var_fs_version}" "luks") if [[ "${ARY_CRYPT_MOUNT_PATHS[*]}" == *"${var_mount_path}"* ]]; then
var_encryption_label=$(get_label "${var_mount_path}" "${var_fs_version}" "luks")
fi
var_fs_uuid="${HMP_PATH_FSUUID["${var_mount_path}"]}" var_fs_uuid="${HMP_PATH_FSUUID["${var_mount_path}"]}"
if [[ -z "${var_fs_uuid}" ]]; then if [[ -z "${var_fs_uuid}" ]]; then

48
func/partitioning/3295_get_label.sh
View File

@@ -24,9 +24,9 @@ guard_sourcing
# Prints resulting label to stdout. # Prints resulting label to stdout.
####################################### #######################################
get_label() { get_label() {
declare -r var_path="${1,,}" declare var_path="${1,,}"
declare -r var_file="${2,,}" declare var_file="${2,,}"
declare -r var_kind="${3,,}" declare var_kind="${3,,}"
### Normalize 'mount.path': remove leading slash and replace slashes with underscore. ### Normalize 'mount.path': remove leading slash and replace slashes with underscore.
declare var_return_label="" declare var_return_label=""
@@ -40,11 +40,11 @@ get_label() {
case "${var_path}" in case "${var_path}" in
swap) var_return_label="part_ephem_swap" ;; swap) var_return_label="part_ephem_swap" ;;
/tmp) var_return_label="part_ephem_tmp" ;; /tmp) var_return_label="part_ephem_tmp" ;;
/boot/efi) var_return_label="part_esp" ;; /boot/efi) var_return_label="part_esp" ;;
/) var_return_label="part_root" ;; /) var_return_label="part_root" ;;
*) var_return_label="part_${var_normalized}" ;; *) var_return_label="part_${var_normalized}" ;;
esac esac
;; ;;
@@ -53,11 +53,11 @@ get_label() {
case "${var_path}" in case "${var_path}" in
/tmp) var_return_label="crypt_ephem_tmp" ;; /tmp) var_return_label="crypt_ephem_tmp" ;;
swap) var_return_label="crypt_ephem_swap" ;; swap) var_return_label="crypt_ephem_swap" ;;
/boot/efi) var_return_label="" ;; /boot/efi) var_return_label="" ;;
/) var_return_label="crypt_root" ;; /) var_return_label="crypt_root" ;;
*) var_return_label="crypt_${var_normalized}" ;; *) var_return_label="crypt_${var_normalized}" ;;
esac esac
;; ;;
@@ -66,16 +66,18 @@ get_label() {
case "${var_path}:${var_file}" in case "${var_path}:${var_file}" in
swap:*) var_return_label="host_swap" ;; swap:*) var_return_label="host_swap" ;;
/tmp:*) var_return_label="host_tmp" ;; /tmp:*) var_return_label="host_tmp" ;;
/boot/efi:*) var_return_label="ESP" ;; /boot/efi:*) var_return_label="ESP" ;;
/var/log/audit:ext4) var_return_label="ext4_var_audit" ;; /var/log/audit:ext4) var_return_label="ext4_var_audit" ;;
*:ext4) var_return_label="ext4_${var_normalized}" *:ext4) var_return_label="ext4_${var_normalized}"
var_return_label="${var_return_label:0:16}" if (( ${#var_return_label} > 16 )); then
do_log "warn" "file_only" "3295() Label: '${var_return_label}' of type: '${var_kind}' created for: '${var_path}' exceeds 16 chars, truncating." do_log "warn" "file_only" "3295() Label: '${var_return_label}' of type: '${var_kind}' created for: '${var_path}' exceeds 16 chars, truncating."
;; var_return_label="${var_return_label:0:16}"
*:btrfs) var_return_label="btrfs_${var_normalized}" ;; fi
*:*) var_return_label="${var_file}_${var_normalized}" ;; ;;
*:btrfs) var_return_label="btrfs_${var_normalized}" ;;
*:*) var_return_label="${var_file}_${var_normalized}" ;;
esac esac
;; ;;