Skip to content

Commit

Permalink
no ld-linux on static
Browse files Browse the repository at this point in the history
  • Loading branch information
rootTHC committed Aug 31, 2024
1 parent fc7c094 commit 7c8a7e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions deploy/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@ init_vars()
fi
}

unset GSNC
unset OSARCH
unset SRC_PKG
# User supplied OSARCH
Expand Down Expand Up @@ -953,7 +954,6 @@ init_vars()
[[ -n $SHELL ]] && [[ "$("$SHELL" -c "echo TRUE" 2>/dev/null)" != "TRUE" ]] && unset SHELL

DEBUGF "DL=${DL[*]}"
# DEBUGF "OLD_PIDS='$OLD_PIDS'"
DEBUGF "SRC_PKG=$SRC_PKG"
}

Expand Down Expand Up @@ -1818,7 +1818,7 @@ test_dstbin()

# Try to execute the binary
unset ERR_LOG
GS_OUT=$(GS_TEST_DSTBIN=1 GS_CONFIG_READ=0 "${DSTBIN_EXEC_ARR[@]}" -g 2>/dev/null)
GS_OUT=$(GS_CONFIG_READ=0 "${DSTBIN_EXEC_ARR[@]}" -g 2>/dev/null)
[[ -z "$GS_OUT" ]] && {
# 126 - Exec format error
FAIL_OUT
Expand Down Expand Up @@ -2124,7 +2124,7 @@ gs_start()

[[ -z $IS_NEED_START ]] && return

(cd "$HOME"; GS_CONFIG_READ="" "${DSTBIN_EXEC_ARR[@]}") || errexit
(cd "$HOME"; unset -v GS_CONFIG_READ; "${DSTBIN_EXEC_ARR[@]}") || errexit
IS_GS_RUNNING=1
}

Expand Down
4 changes: 2 additions & 2 deletions tools/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ try_changeargv0(int argc, char *argv[]) {

if (GSNC_config_read(exename) != 0) {
DEBUGF("GSNC_config_read() failed\n");
// MUST exit if GS_CONFIG_READ=0 is set or otherwise
// Logins via GSNC set GS_CONFIG_READ=0 and GSNC. Must exit or otherwise
// uname -a is started for every gsnc login
if ((!(gopt.flags & GSC_FL_WANT_CONFIG_READ)) && (getenv("GSNC") != NULL) && (getenv("GS_TEST_DSTBIN") == NULL))
if ((!(gopt.flags & GSC_FL_WANT_CONFIG_READ)) && (getenv("GSNC") != NULL))
exit(0);
return;
}
Expand Down

0 comments on commit 7c8a7e8

Please sign in to comment.