summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-08-29 15:27:03 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-08-29 17:03:00 -0300
commita55fc14e24d6ed07961766e36fd45331bbeea7bc (patch)
tree51eee4b0a54686bceb59d6e2eed042e04a32a319 /configs
parent14743f4202eeffca4d80105c7e7ad91bc0af4e88 (diff)
[archiso] Integrate omit_kill_nbd_client logic in hook.
This makes archiso_pxe_nbd functionallity full-independient from archiso profiles (configs/*). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/releng/build.sh1
-rw-r--r--configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client8
2 files changed, 1 insertions, 8 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index e2ee1f9..fa7d13c 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -47,6 +47,7 @@ make_setup_mkinitcpio() {
cp /lib/initcpio/hooks/${_hook} ${work_dir}/root-image/lib/initcpio/hooks
cp /lib/initcpio/install/${_hook} ${work_dir}/root-image/lib/initcpio/install
done
+ cp /lib/initcpio/archiso_pxe_nbd ${work_dir}/root-image/lib/initcpio
: > ${work_dir}/build.${FUNCNAME}
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
deleted file mode 100644
index 60a1192..0000000
--- a/configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client
+++ /dev/null
@@ -1,8 +0,0 @@
-if [[ -f /run/archiso/nbd_client.pid ]]; then
- omit_kill_nbd_client() {
- add_omit_pids $(< /run/archiso/nbd_client.pid)
- }
-
- add_hook shutdown_prekillall omit_kill_nbd_client
- add_hook single_prekillall omit_kill_nbd_client
-fi