From 3df0be6a228745e9ea3102ede4fb865089d73b15 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Fri, 2 Dec 2011 00:44:02 -0300 Subject: [archiso] Do not use PXE NBD as default. * Now we have more than one PXE boot methods. * archiso_ndb_srv= accepts special ${pxeserver} parameter like in others PXE hooks. * This allows to setup network from initramfs without forcing using a special PXE hook. * Update README Signed-off-by: Gerardo Exequiel Pozzi --- archiso/hooks/archiso_pxe_nbd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'archiso/hooks/archiso_pxe_nbd') diff --git a/archiso/hooks/archiso_pxe_nbd b/archiso/hooks/archiso_pxe_nbd index 07e6fee..6147d06 100644 --- a/archiso/hooks/archiso_pxe_nbd +++ b/archiso/hooks/archiso_pxe_nbd @@ -1,9 +1,10 @@ # vim: set ft=sh: run_hook() { - if [[ -n "${ip}" ]]; then + if [[ -n "${ip}" && -n "${archiso_nbd_srv}" ]]; then + + archiso_nbd_srv=$(eval echo ${archiso_nbd_srv}) [[ -z "${archiso_nbd_name}" ]] && archiso_nbd_name="archiso" - [[ -z "${archiso_nbd_srv}" ]] && archiso_nbd_srv="${pxeserver}" mount_handler="archiso_pxe_nbd_mount_handler" fi -- cgit v1.2.3-54-g00ecf