server: Always use flock with --no-fork

Without this my test suite fails. The reason for not using --no-fork
was that it didn't work well on some systems. Since I'm annoyed by not
working test suite, I'm willing to investigate --no-fork problems if
they still exist on current Linux systems.

diff --git a/debian/control b/debian/control
index a01479d1cb913b98f73beb42b5fe7e06db7b63d2..aea9a6b258531a7a8436581a44edf7aba5e69f63 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Description: Tool for booting operating systems on remote hardware
 
 Package: novaboot-server
 Architecture: all
-Depends: dash | bash, util-linux, coreutils, rsync, ${misc:Depends}
+Depends: dash | bash, util-linux >= 2.29, coreutils, rsync, ${misc:Depends}
 Description: Server-side scripts simplifying novaboot target configuration
  This package allows controlling novaboot target hardware via simple,
  unified, SSH-based interface. Most of the target configuration

diff --git a/server/novaboot-shell b/server/novaboot-shell
index 1842d7ae0201653f0d5a0196c1685259b4cdf692..7df9edf79029c92e8d2eebb4e706f94428ede86a 100755 (executable)
--- a/server/novaboot-shell
+++ b/server/novaboot-shell
@@ -79,9 +79,7 @@ print_queue() {
 
 locked() {
     print_queue
-    no_fork=
-    #flock -h 2>&1 | grep -q -e "--no-fork" && no_fork=--no-fork
-    exec flock $no_fork "$RUN_DIR" "$@"
+    exec flock --no-fork "$RUN_DIR" "$@"
 }
 
 unlocked() {