From: Harald Hoyer <harald@redhat.com>
Date: Fri, 3 Jul 2015 12:00:33 +0000 (+0200)
Subject: livenet: don't attempt to download the image for every interface
X-Git-Tag: 044~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3913d061c4bdfad3f496f7a3d0a69e0f3ef51a47;p=thirdparty%2Fdracut.git

livenet: don't attempt to download the image for every interface

https://bugzilla.redhat.com/show_bug.cgi?id=1152485
(cherry picked from commit e5f4bbd804e337a7efaf3a0cb4fc3a37b7e33b47)
---

diff --git a/modules.d/90livenet/livenetroot.sh b/modules.d/90livenet/livenetroot.sh
index 1bbee55b0..2e36ee98a 100755
--- a/modules.d/90livenet/livenetroot.sh
+++ b/modules.d/90livenet/livenetroot.sh
@@ -7,12 +7,20 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 
+[ -e /tmp/livenet.downloaded ] && exit 0
+
 # args get passed from 40network/netroot
 netroot="$2"
 liveurl="${netroot#livenet:}"
 info "fetching $liveurl"
 imgfile=$(fetch_url "$liveurl")
-[ $? = 0 ] || die "failed to download live image: error $?"
+
+if [ $? = 0 ]; then
+	warn "failed to download live image: error $?"
+	exit 1
+fi
+
+> /tmp/livenet.downloaded
 
 # TODO: couldn't dmsquash-live-root handle this?
 if [ ${imgfile##*.} = "iso" ]; then