Move all of the image tools (zapdisk,growdisk,imagezip,frisbee) from

the os subdir into the clientside/os dir.

Mike, use the --follow argument to git log to traverse across the mv.

Makeconf.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 # 
 # Most of the configure-substitution magic is done here.
@@ -102,3 +102,4 @@ MERGE_BUILD_SANDBOX = @MERGE_BUILD_SANDBOX@
 EXP_VIS_SUPPORT    = @EXP_VIS_SUPPORT@
 TESTBED_LIBSRCDIR  = ${TESTBED_SRCDIR}/clientside/lib
 TESTBED_LIBOBJDIR  = ${OBJDIR}/clientside/lib
+TESTBED_IMAGEZIPSRCDIR = ${OBJDIR}/clientside/os/imagezip

clientside/Makeconf.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 # 
 # Most of the configure-substitution magic is done here.
@@ -55,3 +55,4 @@ ELVIN_COMPAT    = @ELVIN_COMPAT@
 WITH_EMULAB     = @WITH_EMULAB@
 TESTBED_LIBSRCDIR  = ${TESTBED_SRCDIR}/lib
 TESTBED_LIBOBJDIR  = ${OBJDIR}/lib
+TESTBED_IMAGEZIPSRCDIR = ${OBJDIR}/os/imagezip

clientside/configure

@@ -4881,7 +4881,14 @@ outfiles="Makeconf GNUmakefile \
 	  tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
 	  tmcc/plab/GNUmakefile \
 	  os/GNUmakefile os/syncd/GNUmakefile \
-	  os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
+	  os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile \
+	  os/frisbee.redux/GNUmakefile \
+	  os/growdisk/GNUmakefile \
+	  os/zapdisk/GNUmakefile \
+	  os/imagezip/GNUmakefile \
+	  os/imagezip/ffs/GNUmakefile \
+	  os/imagezip/extfs/GNUmakefile \
+	  os/imagezip/hashmap/GNUmakefile"
 
 #
 # Do this for easy distclean.

clientside/configure.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
 AC_PREREQ(2.62)
@@ -206,7 +206,14 @@ outfiles="Makeconf GNUmakefile \
 	  tmcc/openbsd/GNUmakefile tmcc/ron/GNUmakefile \
 	  tmcc/plab/GNUmakefile \
 	  os/GNUmakefile os/syncd/GNUmakefile \
-	  os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
+	  os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile \
+	  os/frisbee.redux/GNUmakefile \
+	  os/growdisk/GNUmakefile \
+	  os/zapdisk/GNUmakefile \
+	  os/imagezip/GNUmakefile \
+	  os/imagezip/ffs/GNUmakefile \
+	  os/imagezip/extfs/GNUmakefile \
+	  os/imagezip/hashmap/GNUmakefile"
 
 #
 # Do this for easy distclean.

clientside/os/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
 SRCDIR		= @srcdir@
@@ -13,8 +13,10 @@ SYSTEM	       := $(shell uname -s)
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS	= syncd dijkstra genhostsfile
-
+SUBDIRS	= syncd dijkstra genhostsfile imagezip frisbee.redux 
+ifeq ($(SYSTEM),FreeBSD)
+SUBDIRS += growdisk
+endif
 all:	all-subdirs
 
 include $(TESTBED_SRCDIR)/GNUmakerules
@@ -22,16 +24,16 @@ include $(TESTBED_SRCDIR)/GNUmakerules
 boss-install:
 	$(MAKE) -C genhostsfile boss-install
 	$(MAKE) -C syncd boss-install
+	$(MAKE) -C imagezip boss-install
+	$(MAKE) -C frisbee.redux install
 	-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
 	$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 \
 		$(INSTALL_DIR)/opsdir/man/man1/install-tarfile.1
 
 control-install: 
+	@$(MAKE) -C imagezip install
 
-client:
-	$(MAKE) -C syncd client
-	$(MAKE) -C dijkstra client
-	$(MAKE) -C genhostsfile client
+client: client-subdirs
 
 client-install: client
 	-mkdir -p $(LBINDIR)
@@ -42,10 +44,26 @@ client-install: client
 	$(MAKE) -C syncd client-install
 	$(MAKE) -C dijkstra client-install
 	$(MAKE) -C genhostsfile client-install
+ifeq ($(SYSTEM),FreeBSD)
+	$(MAKE) -C growdisk client-install
+endif
+	$(MAKE) -C frisbee.redux client-install
 
 subboss: client
 
+mfs:
+	$(MAKE) -C growdisk client
+	$(MAKE) -C zapdisk mfs
+	$(MAKE) -C growdisk client
+	$(MAKE) -C imagezip client
+	$(MAKE) -C frisbee.redux client
+
 subboss-install: subboss client-install
+ifeq ($(SYSTEM),FreeBSD)
+	CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux subboss-install
+else
+	CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux subboss-install
+endif
 
 remote-install: 
 	-mkdir -p $(LBINDIR)
@@ -54,10 +72,25 @@ remote-install:
 
 clean:		clean-subdirs
 distclean:	subdir-distclean
-mfs:
-mfs-install:
+
 frisbee-mfs:
+	$(MAKE) -C growdisk client
+	$(MAKE) -C frisbee.redux client
+
 frisbee-mfs-install:
+ifeq ($(SYSTEM),FreeBSD)
+	CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C growdisk client-install
+else
+	CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C growdisk client-install
+endif
+
+mfs-install:
+	$(MAKE) -C zapdisk mfs-install
+	$(MAKE) -C imagezip client-install
+	CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C growdisk client-install
+	CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux client-install
+
+cdboot-install: mfs-install
 
 subdir-distclean:
 	@$(MAKE) -C imagezip distclean

os/frisbee.redux/GNUmakefile.in → clientside/os/frisbee.redux/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= os/frisbee.redux
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 DISTFILES	= TODO client.c decls.h event.c event.h log.c log.h \
 		  network.c queue.h server.c trace.c trace.h utils.c utils.h
@@ -58,7 +57,7 @@ subboss:
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-FRISBEEDIR	= $(OBJDIR)/os/imagezip
+FRISBEEDIR	= $(TESTBED_IMAGEZIPSRCDIR)
 
 SHAREDOBJS	= log.o network.o trace.o utils.o
 

os/growdisk/GNUmakefile.in → clientside/os/growdisk/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2004, 2007 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= os/growdisk
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 include $(OBJDIR)/Makeconf
 

os/imagezip/GNUmakefile.in → clientside/os/imagezip/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= os/imagezip
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
+
 DISTFILES	= global.h imagehdr.h queue.h sliceinfo.h \
 		  imagedump.c imagedump.8 imagezip.c imagezip.8 \
 		  imageunzip.c crc.c checksum.c disksize.c imageunzip.8 \
@@ -219,6 +219,8 @@ version.c: imagezip.c imageunzip.c imagedump.c
 
 install: $(INSTALL_BINDIR)/imagezip $(INSTALL_BINDIR)/imageunzip $(INSTALL_BINDIR)/imagedump $(INSTALL_BINDIR)/imagehash
 
+boss-install: install
+
 client: all
 client-install: client
 	$(INSTALL) -m 755 -o root -d $(DESTDIR)/usr/local/bin

os/imagezip/extfs/GNUmakefile.in → clientside/os/imagezip/extfs/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2004 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= os/imagezip/extfs
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 MAINDIR		= $(SRCDIR)/..
 
 include $(OBJDIR)/Makeconf

os/imagezip/fat/GNUmakefile.in → clientside/os/imagezip/fat/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= os/imagezip/fat
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 MAINDIR		= $(SRCDIR)/..
 
 include $(OBJDIR)/Makeconf

os/imagezip/ffs/GNUmakefile.in → clientside/os/imagezip/ffs/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= os/imagezip/ffs
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 MAINDIR		= $(SRCDIR)/..
 
 include $(OBJDIR)/Makeconf

os/imagezip/hashmap/GNUmakefile.in → clientside/os/imagezip/hashmap/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2005 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= os/imagezip/hashmap
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 MAINDIR		= $(SRCDIR)/..
 
 include $(OBJDIR)/Makeconf

os/imagezip/ntfs/GNUmakefile.in → clientside/os/imagezip/ntfs/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2004, 2009 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../..
-SUBDIR		= os/imagezip/ntfs
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 MAINDIR		= $(SRCDIR)/..
 
 include $(OBJDIR)/Makeconf

os/imagezip/ntfs/liblocale/GNUmakefile.in → clientside/os/imagezip/ntfs/liblocale/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003 University of Utah and the Flux Group.
+# Copyright (c) 2000-2012 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../../../..
-SUBDIR		= os/imagezip/ntfs/liblocale
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 include $(OBJDIR)/Makeconf