From a55fc14e24d6ed07961766e36fd45331bbeea7bc Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 29 Aug 2011 15:27:03 -0300 Subject: [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 --- configs/releng/build.sh | 1 + .../releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/omit_kill_nbd_client (limited to 'configs') 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 -- cgit v1.2.2