Commit e428c661 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents d62d7798 54120c40
......@@ -682,19 +682,17 @@ ClientNetFindServer(in_addr_t sip, in_port_t sport,
close(msock);
return 0;
}
close(msock);
if (strncmp((char *)msg.hdr.version, MS_MSGVERS_1,
sizeof(msg.hdr.version))) {
fprintf(stderr, "Got incorrect version from master server\n");
close(msock);
return 0;
}
if (ntohl(msg.hdr.type) != MS_MSGTYPE_GETREPLY) {
fprintf(stderr, "Got incorrect reply from master server\n");
close(msock);
return 0;
}
close(msock);
/*
* Convert the reply info to host order
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007, 2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -85,7 +85,7 @@ frisbee-mfs-install: destdircheck
@if [ -r $(SRCDIR)/master.passwd ]; then \
$(INSTALL) -m 600 $(SRCDIR)/master.passwd $(SYSETCDIR); \
pwd_mkdb -d $(SYSETCDIR) $(SYSETCDIR)/master.passwd; \
if [ ! -e $(DESTDIR)/bin/csh ]; then \
if [ ! -e $(DESTDIR)/bin/csh -a -e $(DESTDIR)/bin/sh ]; then \
ln $(DESTDIR)/bin/sh $(DESTDIR)/bin/csh; \
fi \
fi
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2006, 2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -66,6 +66,7 @@ frisbee-mfs-install: destdircheck
rm -f $(SYSETCDIR)/rc.early
$(INSTALL) -m 644 $(SRCDIR)/frisbee/rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 644 $(SRCDIR)/frisbee/rc.local $(SYSETCDIR)/rc.local
$(INSTALL) -m 755 -o root -g wheel -d $(SYSETCDIR)/rc.conf.d
$(INSTALL) -m 444 $(SRCDIR)/rc.dhclient $(SYSETCDIR)/rc.conf.d/dhclient
cdboot-install: destdircheck basefbsdcdboot-install etc-install \
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -104,6 +104,7 @@ script-install: dir-install
# (til we switch to 6.x rc.d files)
#
frisbee-mfs-install:
$(INSTALL) -m 755 -o root -g wheel -d $(DESTDIR)/usr/local/etc
(cd ../freebsd5; $(MAKE) all frisbee-mfs-install)
rm -f $(SYSETCDIR)/testbed/dhclient
rm -f $(DESTDIR)/usr/local/etc/dhclient*
......
Markdown is supported
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