Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-03-22 23:29:12 +0100
committerErich Eckner <git@eckner.net>2017-03-22 23:29:12 +0100
commit76f6bc77ccf7bb8ccc3dd1eb9749f57c0d74bfdf (patch)
treeceb26ada2658c9dae2722373727b13f3f334262d
parent60c2e0242099dee65155944071304344b3bfe3ba (diff)
parent3fec50122543908a744c200e0bdfb3ceab6331a7 (diff)
Merge commit '3fec501'
-rw-r--r--archiso/initcpio/hooks/archiso_pxe_common6
1 files changed, 5 insertions, 1 deletions
diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common
index 96a10c5..2380ca3 100644
--- a/archiso/initcpio/hooks/archiso_pxe_common
+++ b/archiso/initcpio/hooks/archiso_pxe_common
@@ -22,7 +22,11 @@ run_hook () {
break
fi
done
- ip="${ip}::${bootif_dev}"
+ if [[ "${ip}" == "dhcp" ]]; then
+ ip=":::::${bootif_dev}:dhcp"
+ else
+ ip="${ip}::${bootif_dev}"
+ fi
fi
# setup network and save some values