summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-06-18 19:46:08 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-07-09 15:14:49 -0300
commitbdd302adaa2b9e1276abc6505e081e0e19a2a84a (patch)
tree114f52cbff97eaa82ff4ae255ae28b2335a18dc2
parent93763a2d8225a92ef99e73478ac118919872ab27 (diff)
Avoid killing nbd-daemon on shutdown
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/hooks/archiso_pxe_nbd2
-rw-r--r--configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client8
2 files changed, 10 insertions, 0 deletions
diff --git a/archiso/hooks/archiso_pxe_nbd b/archiso/hooks/archiso_pxe_nbd
index f18fd4c..484a27c 100644
--- a/archiso/hooks/archiso_pxe_nbd
+++ b/archiso/hooks/archiso_pxe_nbd
@@ -86,5 +86,7 @@ archiso_pxe_nbd_mount_handler () {
if [ "${copytoram}" = "y" ]; then
msg "::: Disconnect NBD from ${nbdserver} at /dev/nbd0"
nbd-client -d /dev/nbd0
+ else
+ pidof nbd-client > /run/nbd_client.pid
fi
}
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client b/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client
new file mode 100644
index 0000000..b72f168
--- /dev/null
+++ b/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client
@@ -0,0 +1,8 @@
+if [[ -f /run/nbd_client.pid ]]; then
+ omit_kill_nbd_client() {
+ add_omit_pids $(< /run/nbd_client.pid)
+ }
+
+ add_hook shutdown_prekillall omit_kill_nbd_client
+ add_hook single_prekillall omit_kill_nbd_client
+fi