Commit 50d6f488 authored by Mike Hibler's avatar Mike Hibler
Browse files

If there is an outer boss node (i.e., we are an inner boss), first try

to fetch ntfsprogs from there rather than www.emulab.net.  The latter may
fail if the control net is unroutable and nodes cannot get to the outside
world (e.g., DETER).
parent 080626a9
...@@ -11,6 +11,7 @@ SUBDIR = os/imagezip/ntfs/libntfs ...@@ -11,6 +11,7 @@ SUBDIR = os/imagezip/ntfs/libntfs
NTFSVER = ntfsprogs-1.7.1 NTFSVER = ntfsprogs-1.7.1
NTFSDIR = ntfsprogs NTFSDIR = ntfsprogs
LIBSRCDIR = $(NTFSDIR)/libntfs LIBSRCDIR = $(NTFSDIR)/libntfs
LOCALPKGHOST = @OUTERBOSS_NODENAME@
PKGHOST = www.emulab.net PKGHOST = www.emulab.net
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
...@@ -69,7 +70,13 @@ libntfs.a: $(LIBSRCDIR)/patched $(OBJS) ...@@ -69,7 +70,13 @@ libntfs.a: $(LIBSRCDIR)/patched $(OBJS)
$(SRCS): $(LIBSRCDIR)/patched $(SRCS): $(LIBSRCDIR)/patched
$(LIBSRCDIR)/patched: $(LIBSRCDIR)/patched:
$(FETCH) http://$(PKGHOST)/$(NTFSVER).tar.gz @if [ -n "$(LOCALPKGHOST)" ]; then \
if [ ! `$(FETCH) http://$(LOCALPKGHOST)/$(NTFSVER).tar.gz` ]; then \
$(FETCH) http://$(PKGHOST)/$(NTFSVER).tar.gz; \
fi \
else \
$(FETCH) http://$(PKGHOST)/$(NTFSVER).tar.gz; \
fi
$(UNPACK) $(NTFSVER).tar.gz $(UNPACK) $(NTFSVER).tar.gz
ifdef LINUX ifdef LINUX
$(PATCH) < $(SRCDIR)/ntfs.linuxpatch $(PATCH) < $(SRCDIR)/ntfs.linuxpatch
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment