diff --git a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 index 0f75897a3c..166e550051 100755 --- a/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/bannerlator-steam-x64 @@ -225,9 +225,73 @@ cd "$STEAM_X64" # over DRI3 even with the GPU off, loops on KMS dumb-buffer ioctls against the KGSL device and never # brings a browser up (the client restarts it every 10 s). On Wayland without a GPU it draws to # shared-memory buffers. +# --- what bannerlator-session gives the arm64 client --------------------------------------- +# The client's connection header and Settings > Internet come from NetworkManager on the SYSTEM +# bus; without them it shows no connection while downloads run. Same bus config and stand-in as the +# session, started here when no system bus is up (a desktop has none), stopped with the client. +x64_bus= x64_nm= x64_pin= +x64_cleanup() { + [ -n "$x64_pin" ] && kill "$x64_pin" 2>/dev/null + [ -n "$x64_nm" ] && kill "$x64_nm" 2>/dev/null + [ -n "$x64_bus" ] && kill "$x64_bus" 2>/dev/null + return 0 +} +trap x64_cleanup EXIT +if ! pgrep -f 'dbus-daemon --config-file=/usr/local/share/bannerlator/system-bus.conf' >/dev/null 2>&1 \ + && command -v dbus-daemon >/dev/null 2>&1 && command -v bannerlator-netmanager >/dev/null 2>&1; then + mkdir -p /run/dbus /usr/local/share/bannerlator + cat > /usr/local/share/bannerlator/system-bus.conf <<'BUSCONF' + + + system + unix:path=/run/dbus/system_bus_socket + EXTERNAL + + + + + + + +BUSCONF + rm -f /run/dbus/system_bus_socket + dbus-daemon --config-file=/usr/local/share/bannerlator/system-bus.conf --nofork --nopidfile & + x64_bus=$! + for _ in $(seq 1 50); do [ -S /run/dbus/system_bus_socket ] && break; sleep 0.1; done + if [ -S /run/dbus/system_bus_socket ]; then + bannerlator-netmanager & + x64_nm=$! + step "network: system bus up, NetworkManager stand-in running" + else + step "network: the system bus did not come up; the client will show no connection" + fi +fi +# What a killed client leaves behind: .crash opens the update UI on its spinner, stale htmlcache +# Singleton* locks can leave the UI blank (as in bannerlator-session). +if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then + for f in "$STEAM_X64/.crash" "$STEAM_X64/steam.pid" "$STEAM_X64/config/htmlcache/SingletonLock" \ + "$STEAM_X64/config/htmlcache/SingletonCookie" "$STEAM_X64/config/htmlcache/SingletonSocket"; do + { [ -e "$f" ] || [ -L "$f" ]; } && rm -f "$f" + done +fi +# The session's CPU set for the client (BL_CLIENT_CPUS): Steam pins itself and its web helper to a +# few cores; re-pin every 5 s as the session does for the arm64 client. +if [ -n "${BL_CLIENT_CPUS:-}" ] && command -v taskset >/dev/null 2>&1; then + ( + while sleep 5; do + for pid in $(ps -A -o PID,ARGS | awk '$2=="FEX" && ($3 ~ /steamrt64\/steam$/ || $3 ~ /steamwebhelper$/) {print $1}'); do + taskset -a -p -c "$BL_CLIENT_CPUS" "$pid" >/dev/null 2>&1 + done + done + ) & + x64_pin=$! +fi # BL_FEX: another FEX build for the client and everything it starts (a DEBUG_STRACE one, say). # Restart on request (42, as steam.sh does), at most a few times. for attempt in 1 2 3 4 5; do + # The branch on disk must match -clientbeta before every start, or the client loops on rc=42. + echo publicbeta > "$STEAM_X64/package/beta" step "starting the x86-64 SteamRT3 client under FEX (attempt $attempt): $*" rc=0 "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" -clientbeta publicbeta -no-cef-sandbox \ diff --git a/tools/linuxfs/preload/pathcache.c b/tools/linuxfs/preload/pathcache.c index 2f2cfd3d40..fe6df48fe1 100644 --- a/tools/linuxfs/preload/pathcache.c +++ b/tools/linuxfs/preload/pathcache.c @@ -57,7 +57,8 @@ static int enabled(void) { if (cached >= 0) return cached; off = getenv("BL_NO_PATH_CACHE"); cached = strcmp(program_invocation_short_name, "steam") == 0 && - strstr(program_invocation_name, "steamrtarm64") != NULL && + (strstr(program_invocation_name, "steamrtarm64") != NULL || + strstr(program_invocation_name, "steamrt64") != NULL) && !(off != NULL && off[0] == '1'); return cached; } diff --git a/tools/linuxfs/preload/perms.c b/tools/linuxfs/preload/perms.c index 96f1540c29..2dccc53df6 100644 --- a/tools/linuxfs/preload/perms.c +++ b/tools/linuxfs/preload/perms.c @@ -24,7 +24,7 @@ #include static int in_steam_dirs(const char *path) { - return path != NULL && (strstr(path, "/Steam/steamrtarm64/") != NULL + return path != NULL && (strstr(path, "/Steam/steamrtarm64/") != NULL || strstr(path, "/Steam/steamrt64/") != NULL || strstr(path, "/Steam/ubuntu12_64/") != NULL || strstr(path, "/Steam/linuxarm64/") != NULL); }