From 51b7ed7f18c6978d14f14f245dbff02589bc6b34 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 24 May 2016 13:57:08 +0200 Subject: only run pxe late hook if $ip is given Signed-off-by: Christian Hesse --- archiso/initcpio/hooks/archiso_pxe_common | 14 ++++++++------ 1 file 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 } -- cgit v1.2.3-54-g00ecf