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

Work on making it easier for complex WMs to be a thing

Browse Source
This commit is contained in:
Salt 2020-08-10 20:39:16 -05:00
parent d792253772
commit 2e2f6a64b5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firestarter
View File

@ -324,11 +324,12 @@ step_postexecute() {
step_wait() { step_wait() {
[ -n "$_optdryrun" ] && exit 0 [ -n "$_optdryrun" ] && exit 0
trap step_logout EXIT trap step_logout EXIT
if [ -n "$FS_DIEONWM" ] && gettarget "$_optconfigdir/wm" && has readlink "$_return"; then log "Checking for window manager" 2
target="$(command -v "$_return")" if [ -n "$FS_DIEONWM" ] && gettarget "$_optconfigdir/wm"; then
target="$_return"
for job in $(jobs -p); do for job in $(jobs -p); do
if [ "$target" = "$(readlink /proc/$job/exe)" ]; then if [ "$target" = "$(cat /proc/$job/cmdline)" ]; then
log "Waiting for WM to exit: \"$_return\"" log "Waiting for WM to exit: \"$target\""
wait "$job" wait "$job"
exit 0 exit 0
fi fi