2 files changed, 5 insertions, 2 deletions
diff --git a/archiso/hooks/archiso_pxe_curl b/archiso/hooks/archiso_pxe_curl
index 80315bc..27deee9 100644
--- a/archiso/hooks/archiso_pxe_curl
+++ b/archiso/hooks/archiso_pxe_curl
@@ -2,8 +2,10 @@
 
 run_hook() {
     if [[ -n "${ip}" && -n "${archiso_curl_url}" ]]; then
+
         archiso_curl_url=$(eval echo ${archiso_curl_url})
         [[ -z "${curlspace_size}" ]] && curlspace_size="75%"
+
         mount_handler="archiso_pxe_curl_mount_handler"
     fi
 }
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