Disable systemd-run if the command is not found. diff -Naur xpra-4.0.1/xpra/scripts/main.py xpra-4.0.1.patched/xpra/scripts/main.py --- xpra-4.0.1/xpra/scripts/main.py 2020-05-17 18:12:15.000000000 +0200 +++ xpra-4.0.1.patched/xpra/scripts/main.py 2020-06-01 12:12:18.500257507 +0200 @@ -312,16 +312,18 @@ if not is_systemd_pid1(): return False #test it: - cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] - proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) - r = pollwait(proc, timeout=1) - if r is None: - try: - proc.terminate() - except Exception: - pass - return r==0 - + try: + cmd = ["systemd-run", "--quiet", "--user", "--scope", "--", "true"] + proc = Popen(cmd, stdin=None, stdout=None, stderr=None, shell=False) + r = pollwait(proc, timeout=1) + if r is None: + try: + proc.terminate() + except Exception: + pass + return r==0 + except FileNotFoundError: + return False def run_mode(script_file, error_cb, options, args, mode, defaults): #configure default logging handler: /openrc/guix-daemon.in'>logtreecommitdiff
path: root/etc/openrc/guix-daemon.in
AgeCommit message (Expand)Author
2021-07-07guix-install.sh: Prompt for configuring substitutes discovery....Also ensure prompt_yes_no always print the message with a trailing space, which is more pleasing to the eye. * etc/guix-daemon.conf.in <--discover=no>: New guix-daemon option. * etc/guix-daemon.service.in: Likewise. * etc/init.d/guix-daemon.in: Likewise. * etc/openrc/guix-daemon.in: Likewise. * etc/guix-install.sh (configure_substitute_discovery): New procedure. (sys_enable_guix_daemon): Ask the user whether automatic substitute discovery should be enabled. Set the '--discover' argument accordingly. (prompt_yes_no): Add a trailing space to the message. (sys_authorize_build_farms): Remove trailing space from the message argument. * NEWS (Distribution): Add news. Maxim Cournoyer