summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-08-26 04:39:03 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-08-28 04:07:04 -0300
commit8c995ee6573b284dbef4c86515765175fbf0e6ce (patch)
treed5fe24d16bb8a775a7428076ac8a6f6ad0f7f383
parent219b43a0bf8ef65c4edc1516f1a408ae8fa3607c (diff)
downloadarchiso32-8c995ee6573b284dbef4c86515765175fbf0e6ce.tar.xz
[archiso] Change location of nbd_client.pid
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso/hooks/archiso_pxe_nbd3
-rw-r--r--configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client4
2 files changed, 4 insertions, 3 deletions
diff --git a/archiso/hooks/archiso_pxe_nbd b/archiso/hooks/archiso_pxe_nbd
index 588e033..3fe988a 100644
--- a/archiso/hooks/archiso_pxe_nbd
+++ b/archiso/hooks/archiso_pxe_nbd
@@ -89,6 +89,7 @@ archiso_pxe_nbd_mount_handler () {
msg "::: Disconnect NBD from ${nbdserver} at /dev/nbd0"
nbd-client -d /dev/nbd0
else
- pidof nbd-client > /run/nbd_client.pid
+ mkdir -p /run/archiso
+ pidof nbd-client > /run/archiso/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
index b72f168..60a1192 100644
--- 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
@@ -1,6 +1,6 @@
-if [[ -f /run/nbd_client.pid ]]; then
+if [[ -f /run/archiso/nbd_client.pid ]]; then
omit_kill_nbd_client() {
- add_omit_pids $(< /run/nbd_client.pid)
+ add_omit_pids $(< /run/archiso/nbd_client.pid)
}
add_hook shutdown_prekillall omit_kill_nbd_client