From c2b20603fdd62a3f82c842c7ebeaad0f70e005d0 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 7 Jan 2023 12:49:18 -0500 Subject: [PATCH] output --- .../modules.d/10ram-wipe-exit/wipe-ram-needshutdown.sh | 4 ++-- usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram.sh | 6 +++--- .../dracut/modules.d/40cold-boot-attack-defense/wipe-ram.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram-needshutdown.sh b/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram-needshutdown.sh index 9621efe..094380b 100644 --- a/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram-needshutdown.sh +++ b/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram-needshutdown.sh @@ -10,7 +10,7 @@ ram_wipe_check_needshutdown() { wipe_action=$(getarg wiperamaction) wait $(pgrep sdmem) - info "DONE WAITING..." + info "wipe-ram.sh wiperamexit: DONE WAITING..." if [ "$wipe_action" = "reboot" ]; then reboot -f @@ -25,7 +25,7 @@ ram_wipe_check_needshutdown() { fi if [ "$wipe_action" = "error" ]; then - info "Choice of shutdown option led to an error. Shutting down..." + info "wipe-ram.sh wiperamexit: Choice of shutdown option led to an error. Shutting down..." sleep 5 poweroff -f fi diff --git a/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram.sh b/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram.sh index b08c7bd..1076c73 100644 --- a/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram.sh +++ b/usr/lib/dracut/modules.d/10ram-wipe-exit/wipe-ram.sh @@ -9,16 +9,16 @@ ram_wipe_action() { kernel_wiperam_exit=$(getarg wiperamexit) if [ "$kernel_wiperam_exit" = "no" ]; then - info "Skip, because wiperamexit=no kernel parameter detected, OK." + info "wipe-ram.sh wiperamexit: Skip, because wiperamexit=no kernel parameter detected, OK." return 0 fi if [ "$kernel_wiperam_exit" != "yes" ]; then - info "Skip, because wiperamexit parameter is unset." + info "wipe-ram.sh wiperamexit: Skip, because wiperamexit parameter is unset." return 0 fi - info "wiperamexit=yes, therefore running second RAM wipe..." + info "wipe-ram.sh wiperamexit: wiperamexit=yes, therefore running second RAM wipe..." sdmem -l -l -v } diff --git a/usr/lib/dracut/modules.d/40cold-boot-attack-defense/wipe-ram.sh b/usr/lib/dracut/modules.d/40cold-boot-attack-defense/wipe-ram.sh index 2cf5043..56cd275 100755 --- a/usr/lib/dracut/modules.d/40cold-boot-attack-defense/wipe-ram.sh +++ b/usr/lib/dracut/modules.d/40cold-boot-attack-defense/wipe-ram.sh @@ -73,7 +73,7 @@ dmsetup_actual_output: '$dmsetup_actual_output'" sleep 5 fi - kexec -e && info "kexec -e succeeded" || warn "kexec -e failed" + kexec -e && info "wipe-ram.sh: kexec -e succeeded" || warn "wipe-ram.sh: kexec -e failed" } ram_wipe