mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-01-05 04:04:04 -05:00
fix java.awt.headless=true inconsistently not being set
This commit is contained in:
@@ -18,4 +18,4 @@ VMARG_LIST="-Djava.awt.headless=true "
|
||||
SCRIPT_FILE="$(readlink -f "$0" 2>/dev/null || readlink "$0" 2>/dev/null || echo "$0")"
|
||||
SCRIPT_DIR="${SCRIPT_FILE%/*}"
|
||||
|
||||
${SCRIPT_DIR}/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"
|
||||
${SCRIPT_DIR}/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "${VMARG_LIST}" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"
|
||||
|
||||
@@ -19,6 +19,6 @@ SCRIPT_DIR="${SCRIPT_FILE%/*}"
|
||||
|
||||
# Some JVM's with class data sharing enabled have issues with BSim starting with Ghidra's custom
|
||||
# classloader, so we will disable sharing
|
||||
VMARG_LIST="-Xshare:off"
|
||||
VMARG_LIST+="-Xshare:off"
|
||||
|
||||
${SCRIPT_DIR}/launch.sh $LAUNCH_MODE jdk "BSimControl" $MAXMEM "${VMARG_LIST}" ghidra.features.bsim.query.BSimControlLaunchable "$@"
|
||||
|
||||
@@ -35,7 +35,7 @@ elif [[ $MODE == "ghidra-server" ]] then
|
||||
elif [[ $MODE == "bsim" ]] then
|
||||
LAUNCH_MODE=${LAUNCH_MODE:=fg}
|
||||
VMARG_LIST=${VMARG_LIST:="-Djava.awt.headless=true "}
|
||||
/ghidra/support/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"
|
||||
/ghidra/support/launch.sh $LAUNCH_MODE jdk "BSim" "${MAXMEM}" "${VMARG_LIST}" ghidra.features.bsim.query.ingest.BSimLaunchable "$@"
|
||||
elif [[ $MODE == "bsim-server" ]] then
|
||||
LAUNCH_MODE=${LAUNCH_MODE:=fg}
|
||||
VMARG_LIST=${VMARG_LIST:="-Djava.awt.headless=true -Xshare:off"}
|
||||
|
||||
Reference in New Issue
Block a user