diff options
| author | Lars Wirzenius <liw@liw.fi> | 2021-07-12 12:14:10 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2021-07-12 12:14:10 +0300 |
| commit | 2543f6025dec5a99e308b1ed548313fc96f042cf (patch) | |
| tree | 0e8456bdd8a7905b84b6953686105a38a7259855 /subplot | |
| parent | bb0f006a218aa958e37ecfeff71a21a54618c9c4 (diff) | |
| download | debian-ansible-2543f6025dec5a99e308b1ed548313fc96f042cf.tar.gz | |
fix: use correct path for daemonize on Debian 11 (bullseye)
Sponsored-by: author
Diffstat (limited to 'subplot')
| -rw-r--r-- | subplot/daemon.py | 2 | ||||
| -rwxr-xr-x | subplot/qemumgr.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/subplot/daemon.py b/subplot/daemon.py index e223505..0173731 100644 --- a/subplot/daemon.py +++ b/subplot/daemon.py @@ -29,7 +29,7 @@ def start_daemon(ctx, name, argv): runcmd( ctx, [ - "/usr/sbin/daemonize", + "/usr/bin/daemonize", # sbin prior to Debian 11 (bullseye), bin now "-c", os.getcwd(), "-p", diff --git a/subplot/qemumgr.py b/subplot/qemumgr.py index bfc3f24..69a2ce0 100755 --- a/subplot/qemumgr.py +++ b/subplot/qemumgr.py @@ -107,7 +107,7 @@ class QemuSystem: memory = int(self._memory / MiB) argv = [ - "/usr/sbin/daemonize", + "/usr/bin/daemonize", "-c", self._dirname, "-p", @@ -140,7 +140,7 @@ class QemuSystem: subprocess.check_call(argv, stdout=None, stderr=None) self._pid = int(wait_for(lambda: got_pid(pid_file), 1)) - logging.debug(f"started qemu-system") + logging.debug("started qemu-system") logging.debug(f" argv: {argv}") logging.debug(f" pid: {self._pid}") @@ -157,7 +157,7 @@ class QemuSystem: return True return None - return wait_for(ssh_ok, 60, sleep=5) + return wait_for(ssh_ok, 120, sleep=5) def ssh(self, argv): assert self._username is not None |