From 2543f6025dec5a99e308b1ed548313fc96f042cf Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Mon, 12 Jul 2021 12:14:10 +0300
Subject: fix: use correct path for daemonize on Debian 11 (bullseye)

Sponsored-by: author
---
 subplot/daemon.py  | 2 +-
 subplot/qemumgr.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'subplot')

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
-- 
cgit v1.2.1