index : mkinitcpio-archiso32 | |
Archlinux32 initcpio scripts used by archiso | gitolite user |
summaryrefslogtreecommitdiff |
author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-12-02 00:44:02 -0300 |
---|---|---|
committer | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-12-02 14:12:16 -0300 |
commit | 5d7d6cfef80349496421cffc928cc4454f79d2c6 (patch) | |
tree | b151e48a63b9bee2bc091f8f076dbd2493fb8781 | |
parent | 4cbe8f06f3c8d031c2395708c754d1b118715178 (diff) |
-rw-r--r-- | archiso/hooks/archiso_pxe_curl | 2 | ||||
-rw-r--r-- | archiso/hooks/archiso_pxe_nbd | 5 |
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 |