salt/firestarter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rework nest protection

Browse Source
This commit is contained in:
Salt 2020-08-08 02:46:59 -05:00
parent 8a2624ca2f
commit b30363cc54
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -66,6 +66,7 @@ Firestarter, in addition to spawning the programs in the default configs, also i
| 53 | Failed to create logging directory | | 53 | Failed to create logging directory |
| 54 | `HOME` does not exist or is unreadable | | 54 | `HOME` does not exist or is unreadable |
| 55 | Firestarter is already running | | 55 | Firestarter is already running |
| 56 | Firestarter is not running |
| 70 | No configuration files available | | 70 | No configuration files available |
## Idiosyncracies ## Idiosyncracies

18
firestarter
View File

@ -148,7 +148,9 @@ fslist() {
} }
fsstatus() { fsstatus() {
# List statistics about firestarter # List statistics about firestarter
warn "NYI" if [ -z "$FIRESTARTER" ]; then
error "Firestarter is not currently running" 56
fi
} }
step_preexecute() { step_preexecute() {
# Special things that can't use simple configuration files # Special things that can't use simple configuration files
@ -421,19 +423,7 @@ main() {
done done
# Early hook for help # Early hook for help
[ -n "$_opthelp" ] && printhelp && exit 0 [ -n "$_opthelp" ] && printhelp && exit 0
# Ensure our running environment is sane and that we're not about to nest # Ensure our running environment is sane
if [ -z "$_optdryrun" ]; then
for pid in $(pgrep firestarter); do
# Skip invalid PIDs
! [ -d "$/proc/$pid" ] && continue
# If it's not our session then who cares
[ "$_sessionid" != "$(< "/proc/$pid/sessionid")" ] && continue
# If it's us then who cares
[ "$pid" == "$BASHPID" ] && continue
# We care
error "Firestarter is already running: $pid" 40
done
fi
if ! [ -d "$HOME" ] || ! [ -r "$HOME" ]; then if ! [ -d "$HOME" ] || ! [ -r "$HOME" ]; then
error "Home directory not found or inaccessable: \"$HOME\"" 54 error "Home directory not found or inaccessable: \"$HOME\"" 54
fi fi