diff options
| author | Christian Hesse <mail@eworm.de> | 2016-05-24 13:57:08 +0200 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@gmail.com> | 2016-05-24 21:31:37 -0300 |
| commit | 51b7ed7f18c6978d14f14f245dbff02589bc6b34 (patch) | |
| tree | 49915c71b541ff8731ae73a95041d728c368b532 | |
| parent | ca85896bfcc281df871a93d3dd9e136a244a9703 (diff) | |
| download | archiso32-51b7ed7f18c6978d14f14f245dbff02589bc6b34.tar.xz | |
only run pxe late hook if $ip is given
Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | archiso/initcpio/hooks/archiso_pxe_common | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index 2449b6c..e97324f 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -47,12 +47,14 @@ run_hook () { } run_latehook () { - [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y" + if [[ -n "${ip}" ]]; then + [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y" - if [[ "${copytoram}" == "y" ]]; then - ip addr flush ${bootif_dev} - ip link set ${bootif_dev} down - elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then - cp /etc/resolv.conf /new_root/etc/resolv.conf + if [[ "${copytoram}" == "y" ]]; then + ip addr flush ${bootif_dev} + ip link set ${bootif_dev} down + elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then + cp /etc/resolv.conf /new_root/etc/resolv.conf + fi fi } |