From bfbb2356a9d3f946844b9780e19af75df17bdf58 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Thu, 10 Feb 2011 17:07:48 -0700
Subject: [PATCH] A couple of bugfixes and install script

---
 Makefile                     |  7 ++++++
 install.sh                   | 49 ++++++++++++++++++++++++++++++++++++
 packages/mcp/bin/new-contest |  2 +-
 packages/posters/posters.mk  |  3 +++
 4 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100755 install.sh

diff --git a/Makefile b/Makefile
index 19afd28..39c536f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,13 @@ BIN = bin
 
 all: packages
 
+dist: ctf-install.zip
+ctf-install.zip: packages.zip /usr/lib/syslinux/mbr.bin
+	zip --junk-paths $@ packages.zip /usr/lib/syslinux/mbr.bin install.sh
+
+packages.zip: packages bzImage rootfs.squashfs
+	zip --junk-paths $@ bin/*.pkg bzImage rootfs.squashfs
+
 clean: packages-clean
 	rm -rf $(BUILD) $(TARGET) $(BIN)
 
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..8c4e42e
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+
+DRIVE=$1
+if ! [ -b "$DRIVE" ]; then
+    echo "Usage: $0 DEVICE"
+    echo
+    echo "Prepares DEVICE with Capture The Flag goodness"
+    exit
+fi
+
+
+FATFS=${DRIVE}1
+EXTFS=${DRIVE}2
+
+sfdisk $DRIVE <<EOF
+0,60,6,*
+,,L
+EOF
+sync
+
+mkdir -p /mnt/ctf-install
+
+mkdosfs -n PACKAGES $FATFS
+mke2fs -j -L VAR $EXTFS
+
+cat mbr.bin > $DRIVE
+mount $FATFS /mnt/ctf-install
+mkdir /mnt/ctf-install/syslinux
+umount /mnt/ctf-install
+syslinux -d syslinux $FATFS
+
+mount $FATFS /mnt/ctf-install
+cp rootfs.squashfs /mnt/ctf-install/syslinux/dbtl.squashfs
+cp bzImage /mnt/ctf-install/syslinux/
+
+cat <<EOD >/mnt/ctf-install/syslinux/syslinux.cfg
+DEFAULT ctf
+LABEL ctf
+  KERNEL bzImage
+  INITRD dbtl.squashfs
+EOD
+
+cp $(basename $0)/../bin/*.pkg /mnt/ctf-install
+umount /mnt/ctf-install
+rmdir /mnt/ctf-install
+
+sync
+
+echo "Done"
diff --git a/packages/mcp/bin/new-contest b/packages/mcp/bin/new-contest
index 1f56500..f62635d 100755
--- a/packages/mcp/bin/new-contest
+++ b/packages/mcp/bin/new-contest
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-if [ "$1" -ne "-f" ]; then
+if [ "$1" != "-f" ]; then
     echo "Usage: $0 -f"
     echo
     echo "Wipes out the current contest.  This operation is not"
diff --git a/packages/posters/posters.mk b/packages/posters/posters.mk
index d5b4a7b..b434e57 100644
--- a/packages/posters/posters.mk
+++ b/packages/posters/posters.mk
@@ -2,4 +2,7 @@ posters-source:
 posters-build:
 
 posters-install: packages/posters/tokens.txt
+	mkdir -p $(TARGET)/posters/
 	cp $< $(TARGET)/posters/
+
+PACKAGES += posters