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 1m14s
Details

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-10-07 11:51:40 +01:00
parent 976708cc13
commit 77ba7a79aa
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
func/cdi_3200_partitioning/3200_partitioning.sh
View File

@@ -17,6 +17,7 @@ guard_sourcing
# BIOS Boot Partition | EF02 | BIOS Bootloader area (GRUB) # BIOS Boot Partition | EF02 | BIOS Bootloader area (GRUB)
# Linux SWAP | 8200 | Linux Swap # Linux SWAP | 8200 | Linux Swap
# Linux ext4/btrfs | 8300 | Linux Filesystem (root, home) # Linux ext4/btrfs | 8300 | Linux Filesystem (root, home)
# Linux LUKS | 8309 | Linux LUKS
####################################### #######################################
####################################### #######################################
@@ -259,7 +260,8 @@ partitioning() {
case "${var_mount_path,,}" in case "${var_mount_path,,}" in
/tmp|swap) : ;; /tmp|swap)
typecode="ca7d7ccb-63ed-4c53-861c-1742536059cc" ;; ### Linux LUKS Partition
*) *)
typecode="ca7d7ccb-63ed-4c53-861c-1742536059cc" ;; ### Linux LUKS Partition typecode="ca7d7ccb-63ed-4c53-861c-1742536059cc" ;; ### Linux LUKS Partition

11
func/cdi_3200_partitioning/3280_mount_partition.sh
View File

@@ -212,13 +212,12 @@ mount_partition() {
var_encryption_label=$(get_label "${var_mount_path}" "${var_fs_version}" "luks") var_encryption_label=$(get_label "${var_mount_path}" "${var_fs_version}" "luks")
fi fi
var_fs_uuid="${HMP_PATH_FSUUID["${var_mount_path}"]}"
var_partuuid="${HMP_PATH_PARTUUID["${var_mount_path}"]}" var_partuuid="${HMP_PATH_PARTUUID["${var_mount_path}"]}"
if [[ -z "${var_fs_uuid}" ]]; then #if [[ -z "${var_fs_uuid}" ]]; then
do_log "error" "file_only" "3280() FS-UUID for mount path: '${var_mount_path}' not found in: 'HMP_PATH_FSUUID'." # do_log "error" "file_only" "3280() FS-UUID for mount path: '${var_mount_path}' not found in: 'HMP_PATH_FSUUID'."
return "${ERR_MOUNTING_DEV}" # return "${ERR_MOUNTING_DEV}"
fi #fi
### Mounting of Ephemeral 'SWAP' and '/tmp' as per https://wiki.archlinux.org/title/Dm-crypt/Swap_encryption#UUID_and_LABEL ### Mounting of Ephemeral 'SWAP' and '/tmp' as per https://wiki.archlinux.org/title/Dm-crypt/Swap_encryption#UUID_and_LABEL
if [[ "${var_mount_path,,}" == "swap" ]]; then if [[ "${var_mount_path,,}" == "swap" ]]; then
@@ -273,6 +272,8 @@ mount_partition() {
fi fi
var_fs_uuid="${HMP_PATH_FSUUID["${var_mount_path}"]}"
if [[ "${var_fs_version,,}" == "btrfs" ]]; then if [[ "${var_fs_version,,}" == "btrfs" ]]; then
var_fs_btrfs_subvolume=$(get_label "${var_mount_path}" "${var_fs_version}" "sub") var_fs_btrfs_subvolume=$(get_label "${var_mount_path}" "${var_fs_version}" "sub")