From a7e5f8989a62ec248aa55ab898fd4edee80e3e45 Mon Sep 17 00:00:00 2001 From: Salt Date: Thu, 18 Jun 2020 08:36:57 -0500 Subject: [PATCH] Improve logging, trap SIGALRM --- firestarter | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/firestarter b/firestarter index 5855cec..cdee7d5 100755 --- a/firestarter +++ b/firestarter @@ -106,8 +106,10 @@ fsexec() { local file="$1" local filename="$(basename -- "$file")" local logfile="$_optlogdir/$filename.log" + log "Inspecting configuration file: $filename" 2 if gettarget "$file"; then # It's a defaults file with a selected target + log "File is an fsdefaults file" 2 target="$_return" log "Found target for $filename: \"$target\"" [ -n "$_optdryrun" ] && return @@ -118,6 +120,7 @@ fsexec() { bash -c "$target" > "$logfile" 2>&1 & elif [ $? = 50 ] && [ -x "$file" ]; then # It's a shell script or executable symlink + log "File is an executable" 2 log "Executing file: \"$filename\"" [ -n "$_optdryrun" ] && return "$file" > "$logfile" 2>&1 & @@ -422,7 +425,8 @@ main() { if ! has basename; then error "Failed to find program: $_return" 1 fi - + # Fixes random SIGALRM bug + trap : SIGALRM # Do the do firestart exit 0