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

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-09-03 16:16:50 +02:00
parent e0f28652a4
commit 86197d0f5c
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
func/cdi_4100_base/4121_installation_initramfs.sh
View File

@@ -13,7 +13,7 @@
guard_sourcing guard_sourcing
####################################### #######################################
# Installation of the specified kernel. # Installation of 'initramfs'-environment.
# Every 'apt-get install' command is invoked by adding 'export INITRD=No' # Every 'apt-get install' command is invoked by adding 'export INITRD=No'
# to suppress the 'update-initramfs'-Kernel-Hooks, according to the initramfs-tools manpage: # to suppress the 'update-initramfs'-Kernel-Hooks, according to the initramfs-tools manpage:
# https://manpages.debian.org/testing/initramfs-tools-core/initramfs-tools.7.en.html # https://manpages.debian.org/testing/initramfs-tools-core/initramfs-tools.7.en.html
@@ -32,11 +32,7 @@ installation_initramfs() {
mkdir -p "${TARGET}/etc/initramfs-tools/files" mkdir -p "${TARGET}/etc/initramfs-tools/files"
### Install the script to be called by 'update-initramfs' to enforce merged-/usr symlinks inside the initramfs image. ### Install the script that will be called by 'update-initramfs' to install the necessary modules for the initramfs environment.
#install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/hooks/9999-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.
install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/modules" \ install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/modules" \
"${TARGET}/etc/initramfs-tools/" "${TARGET}/etc/initramfs-tools/"

5
includes/target/etc/initramfs-tools/files/unlock_wrapper.sh
View File

@@ -274,14 +274,11 @@ read_passphrase() {
ROUNDS="$(cut -d'$' -f3 <<< "${NUKE_HASH}")" ROUNDS="$(cut -d'$' -f3 <<< "${NUKE_HASH}")"
ROUNDS="${ROUNDS#rounds=}" ROUNDS="${ROUNDS#rounds=}"
SALT="$(cut -d'$' -f4 <<< "${NUKE_HASH}")" SALT="$(cut -d'$' -f4 <<< "${NUKE_HASH}")"
_FULL_SALT="\$6\$rounds=${ROUNDS}\$${SALT}" CAND=$(/usr/bin/mkpasswd --method=sha-512 --salt="${SALT}" --rounds="${ROUNDS}" "${PASSPHRASE}")
CAND=$(mkpasswd -m sha512 -S "${_FULL_SALT}" "${PASSPHRASE}" )
# CAND=$(/usr/bin/mkpasswd --method=sha-512 --salt="${SALT}" --rounds="${ROUNDS}" "${PASSPHRASE}")
# TODO: DEBUGGER # TODO: DEBUGGER
echo "ROUNDS : ${ROUNDS}" echo "ROUNDS : ${ROUNDS}"
echo "SALT : ${SALT}" echo "SALT : ${SALT}"
echo "_FULL_SALT: ${_FULL_SALT}"
echo "CAND : ${CAND}" echo "CAND : ${CAND}"
echo "NUKE_HASH : ${NUKE_HASH}" echo "NUKE_HASH : ${NUKE_HASH}"