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

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-08-31 16:36:31 +02:00
parent fa6a9dc753
commit 5ef09f8651
6 changed files with 81 additions and 44 deletions

View File

@@ -357,8 +357,8 @@ partitioning() {
}
' |
### c) Sort NUL-separated by the group, then lexicographically by the *full path*:
### This ensures parent before child due to prefix property:
### "/boot" < "/boot/efi", "/var/log" < "/var/log/audit" < "/var/tmp"
### This ensures parent before child due to prefix property:
### "/boot" < "/boot/efi", "/var/log" < "/var/log/audit" < "/var/tmp"
sort -z -t $'\t' -k1,1 -k2,2 | cut -z -f2-
)

View File

@@ -31,7 +31,7 @@ installation_initramfs() {
declare var_modules=""
### Install the script to be called by 'update-initramfs' to enforce merged-/usr symlinks inside the initramfs image.
install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/hooks/custom-usrmerge.sh" \
install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/hooks/zzzz-custom-usrmerge.sh" \
"${TARGET}/etc/initramfs-tools/hooks/"
### Install the script to be called by 'update-initramfs' for installing the necessary modules to load into initramfs environment.

View File

@@ -28,6 +28,12 @@ installation_masking() {
do_log "info" "file_only" "4133() Masked: [ctrl-alt-del.target sleep.target suspend.target hibernate.target hybrid-sleep.target]."
chroot_script "${TARGET}" "
systemctl mask plymouth-start.service plymouth-quit.service plymouth-quit-wait.service plymouth-read-write.service
"
do_log "info" "file_only" "4133() Masked: [plymouth-start.service plymouth-quit.service plymouth-quit-wait.service plymouth-read-write.service]."
guard_dir && return 0
}
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -28,9 +28,6 @@ guard_sourcing
write_fstab() {
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
#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}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then
if [[ "${write_maps}" == /dev/mapper/* ]]; then
printf "%-43s%-28s%-18s%-100s0 %s\n" "${write_maps}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab"