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

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-07-29 20:46:41 +02:00
parent ae0dd36ff6
commit 56e7c59905
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
func/partitioning/3240_partition_formatting.sh
View File

@@ -130,6 +130,7 @@ partition_formatting() {
esac esac
var_dev="${var_dev_part%.*}"
lsblk -o NAME,MAJ:MIN,FSTYPE,FSVER,SIZE,UUID,MOUNTPOINT,PATH "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_overview_3240.log" lsblk -o NAME,MAJ:MIN,FSTYPE,FSVER,SIZE,UUID,MOUNTPOINT,PATH "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_overview_3240.log"
printf "%b" "${NL}" >> "${DIR_LOG}/${var_dev}_overview_3240.log" printf "%b" "${NL}" >> "${DIR_LOG}/${var_dev}_overview_3240.log"
lsblk "/dev/${var_dev}" >> "${DIR_LOG}/${var_dev}_overview_3240.log" lsblk "/dev/${var_dev}" >> "${DIR_LOG}/${var_dev}_overview_3240.log"

3
func/partitioning/3280_mount_partition.sh
View File

@@ -203,7 +203,7 @@ mount_partition() {
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")
### Mount toplevel (subvolid=0) without extra options. ### Mount toplevel (subvolid=0) without extra options.
ary_cmd_mount=( mount -o "subvolid=0" "${var_fs_uuid}" "${VAR_SAFE_MNT_BASE}" ) ary_cmd_mount=( mount -o "subvolid=0" "/dev/disk/by-uuid/${var_fs_uuid}" "${VAR_SAFE_MNT_BASE}" )
safe_exec "${ary_cmd_mount[@]}" "${ERR_BTRFS_INITPH}" || return "${ERR_BTRFS_INITPH}" safe_exec "${ary_cmd_mount[@]}" "${ERR_BTRFS_INITPH}" || return "${ERR_BTRFS_INITPH}"
btrfs subvolume create "${VAR_SAFE_MNT_BASE}/${var_fs_btrfs_subvolume}" btrfs subvolume create "${VAR_SAFE_MNT_BASE}/${var_fs_btrfs_subvolume}"
@@ -288,6 +288,7 @@ mount_partition() {
esac esac
var_dev="${var_dev_part%.*}"
lsblk -o NAME,MAJ:MIN,FSTYPE,FSVER,SIZE,UUID,MOUNTPOINT,PATH "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_overview_3280.log" lsblk -o NAME,MAJ:MIN,FSTYPE,FSVER,SIZE,UUID,MOUNTPOINT,PATH "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_overview_3280.log"
printf "%b" "${NL}" >> "${DIR_LOG}/${var_dev}_overview_3280.log" printf "%b" "${NL}" >> "${DIR_LOG}/${var_dev}_overview_3280.log"
lsblk "/dev/${var_dev}" >> "${DIR_LOG}/${var_dev}_overview_3280.log" lsblk "/dev/${var_dev}" >> "${DIR_LOG}/${var_dev}_overview_3280.log"

2
lib/0011_guard_safe_exec.sh
View File

@@ -22,7 +22,7 @@ safe_exec() {
declare -a ary_cmd=("${@:1:$#-1}") # All but last arg. declare -a ary_cmd=("${@:1:$#-1}") # All but last arg.
declare var_errcode="${!#}" # Last arg. declare var_errcode="${!#}" # Last arg.
"${ary_cmd[@]}" && return 0 "${ary_cmd[@]}" && return 0
do_log "error" "false" "Command '${ary_cmd[*]}' failed." do_log "error" "file_only" "Command '${ary_cmd[*]}' failed."
return "${var_errcode}" return "${var_errcode}"
} }
# 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

1
var/global.var.sh
View File

@@ -29,6 +29,7 @@ declare -grx VAR_RESOURCES=$(ulimit)
declare -grx DIR_BAK="/tmp/.ciss/backup" declare -grx DIR_BAK="/tmp/.ciss/backup"
declare -grx DIR_LOG="/tmp/.ciss/log" declare -grx DIR_LOG="/tmp/.ciss/log"
declare -grx DIR_TMP="/tmp/.ciss/tmp" declare -grx DIR_TMP="/tmp/.ciss/tmp"
# shellcheck disable=SC2153
declare -grx DIR_CNF="${VAR_SETUP_PATH}/.preseed" declare -grx DIR_CNF="${VAR_SETUP_PATH}/.preseed"
declare -grx DIR_INS="${VAR_SETUP_PATH}" declare -grx DIR_INS="${VAR_SETUP_PATH}"