fix: preserve environment in systemd launch

This commit is contained in:
Kevin Yue committed 2026-09-13 13:26:49 +08:00
1 parent e2a64ed7d4
commit 9d8c3b4e34
3 files changed
+4 -8

No files matched your search

-2
View File
@@ -16,5 +16,3 @@ gen
# Nix files # Nix files
result result
.DS_Store
+1 -4
View File
@@ -117,10 +117,7 @@ fn build_openconnect(deps_dir: &PathBuf, out_dir: &PathBuf) -> PathBuf {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
{ {
config config.disable_static().enable_shared().without("gnutls", None);
.disable_static()
.enable_shared()
.without("gnutls", None);
config.ldflag("-liconv"); config.ldflag("-liconv");
config.env("LIBS", "-liconv"); config.env("LIBS", "-liconv");
} }
+3 -2
View File
@@ -297,14 +297,15 @@
--service-type=exec --service-type=exec
) )
while IFS= read -r env_name; do while IFS= read -r -d "" env_entry; do
env_name="''${env_entry%%=*}"
case "$env_name" in case "$env_name" in
*[!A-Za-z0-9_]* | [0-9]* | PATH | GP_VPNC_SCRIPT_INSTALLER_BINARY | INVOCATION_ID | JOURNAL_STREAM | LISTEN_* | NOTIFY_SOCKET | SYSTEMD_EXEC_PID) *[!A-Za-z0-9_]* | [0-9]* | PATH | GP_VPNC_SCRIPT_INSTALLER_BINARY | INVOCATION_ID | JOURNAL_STREAM | LISTEN_* | NOTIFY_SOCKET | SYSTEMD_EXEC_PID)
continue continue
;; ;;
esac esac
systemd_run_args+=("--setenv=$env_name") systemd_run_args+=("--setenv=$env_name")
done < <(compgen -e) done < <(${pkgs.coreutils}/bin/env --null)
gui_path="/run/wrappers/bin:''${PATH:-}" gui_path="/run/wrappers/bin:''${PATH:-}"
systemd_run_args+=( systemd_run_args+=(