Commit f13e5251 authored by Mike Hibler's avatar Mike Hibler

Minor nits for FBSD6 support

parent f87a29b7
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -13,9 +13,17 @@ include $(OBJDIR)/Makeconf
all:
client-install:
client:
$(MAKE) -C groklilo client
$(MAKE) -C tbbootconfig client
client-install: client
$(MAKE) -C groklilo client-install
$(MAKE) -C tbbootconfig client-install
clean:
$(MAKE) -C groklilo clean
$(MAKE) -C tbbootconfig clean
include $(TESTBED_SRCDIR)/GNUmakerules
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
......@@ -21,7 +21,9 @@ LFLAGS += -lz
tbbootconfig: tbbootconfig.c
$(CC) $(CFLAGS) -static -g -o tbbootconfig $< $(LFLAGS)
client-install: tbbootconfig
client: tbbootconfig
client-install: client
$(INSTALL_PROGRAM) tbbootconfig $(DESTDIR)$(CLIENT_BINDIR)
clean:
......
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2000-2004 University of Utah and the Flux Group.
* Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
* All rights reserved.
*/
......@@ -374,7 +374,7 @@ struct configval {
(char *) &foohdr.sysconfig.hostname - (char *) &foohdr },
{"domain", CONFIG_STRING, sizeof(foohdr.sysconfig.domain),
(char *) &foohdr.sysconfig.domain - (char *) &foohdr },
{"bootdisk", CONFIG_IGNORE, 0, NULL },
{"bootdisk", CONFIG_IGNORE, 0, 0 },
};
int maxconfigs = sizeof(configvals)/sizeof(struct configval);
......@@ -403,7 +403,7 @@ readconfigfromfile(int devfd, tbboot_t *tbhdr, char *path)
warnx("Misformed input line: '%s'\n", buf);
return -1;
}
*bp = NULL;
*bp = 0;
name = buf;
value = bp + 1;
......
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