fix: dom0 as sys-git client

The salt module git.config_get does not work in Dom0 and does not have
a key to set the system gitconfig.
This commit is contained in:
Ben Grande 2024-01-18 09:19:40 +01:00
parent 5bc9c79974
commit d0765f2055
No known key found for this signature in database
GPG key ID: 00C64E14F51F9E56
5 changed files with 23 additions and 6 deletions

View file

@ -40,12 +40,12 @@ default_qube="sys-git"
rpc_cmd="${vendor}.${rpc}+${repo}"
if command -v qrexec-client-vm >/dev/null; then
exec qrexec-client-vm -- "${authority}" "${rpc_cmd}"
exec qrexec-client-vm -tT -- "${authority}" "${rpc_cmd}"
elif command -v qrexec-client >/dev/null; then
if test "${authority}" = "@default"; then
authority="${default_qube}"
fi
exec qrexec-client -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
exec qrexec-client -tT -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
fi
die "Qrexec programs not found: qrexec-client-vm, qrexec-client"

View file

@ -66,14 +66,14 @@ then
fi
if command -v qrexec-client-vm >/dev/null; then
log "->" qrexec-client-vm -- "${authority}" "${rpc_cmd}"
exec qrexec-client-vm -- "${authority}" "${rpc_cmd}"
log "->" qrexec-client-vm -T -- "${authority}" "${rpc_cmd}"
exec qrexec-client-vm -T -- "${authority}" "${rpc_cmd}"
elif command -v qrexec-client >/dev/null; then
if test "${authority}" = "@default"; then
authority="${default_qube}"
fi
log "->" qrexec-client -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
exec qrexec-client -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
log "->" qrexec-client -T -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
exec qrexec-client -T -d "${authority}" -- "DEFAULT:QUBESRPC ${rpc_cmd} dom0"
fi
die "Qrexec programs not found: qrexec-client-vm, qrexec-client"