From 0c21efb96cc1ecc21681c519af7da821cfe4ff46 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Mon, 2 Jul 2012 18:21:00 -0600
Subject: [PATCH] add gs service, use new eris command-line option

---
 go                             | 6 +++---
 packages/gs/answers.txt        | 7 +++++++
 packages/gs/gs.mk              | 8 ++++++++
 packages/mcp/service/httpd/run | 4 ++--
 packages/p2/service/httpd/run  | 4 ++--
 5 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 packages/gs/answers.txt
 create mode 100644 packages/gs/gs.mk

diff --git a/go b/go
index 75478d0..c1c089b 100755
--- a/go
+++ b/go
@@ -10,7 +10,7 @@ case ${1:-$TYPE} in
         packages='router'
         ;;
     p2)
-        packages='p2 sequence'
+        packages='p2 gs p2steg archaeology '
         ;;
     p2cli)
         packages='p2client'
@@ -45,8 +45,8 @@ echo $ARCH
 
 if [ $ARCH = i386-linux ]; then
     lsmod | grep -q kvm-intel || sudo modprobe kvm-intel
-    sudo kvm \
-        -serial stdio \
+    sudo qemu-system-i386 \
+        -nographic \
         -kernel $HOME/src/buildroot/output/images/bzImage \
         -initrd $HOME/src/buildroot/output/images/rootfs.squashfs \
         -append "console=ttyS0 packages=/dev/sda ipv6 debug" \
diff --git a/packages/gs/answers.txt b/packages/gs/answers.txt
new file mode 100644
index 0000000..7addebd
--- /dev/null
+++ b/packages/gs/answers.txt
@@ -0,0 +1,7 @@
+10 making science
+30 viewfinders filets
+40 b00m! face punch.
+40 B00M! FACE PUNCH.
+60 A WINNER IS YOU
+80 overhaul credential
+90 A WINNER IS WHO?
diff --git a/packages/gs/gs.mk b/packages/gs/gs.mk
new file mode 100644
index 0000000..17901d6
--- /dev/null
+++ b/packages/gs/gs.mk
@@ -0,0 +1,8 @@
+GS_PKGDIR = $(TARGET)/gs
+
+gs-install:
+	mkdir -p $(GS_PKGDIR)
+	cp packages/gs/answers.txt $(GS_PKGDIR)
+
+PACKAGES += gs
+
diff --git a/packages/mcp/service/httpd/run b/packages/mcp/service/httpd/run
index 7ecd50e..b0462b8 100755
--- a/packages/mcp/service/httpd/run
+++ b/packages/mcp/service/httpd/run
@@ -18,5 +18,5 @@ for d in /opt/*; do
     fi
 done
 
-ln -sf /var/www default
-exec tcpsvd -u ctf ${IP%/*} 80 /opt/mcp/bin/eris -c
+cd /var/www
+exec tcpsvd -u ctf ${IP%/*} 80 /opt/mcp/bin/eris -c.
diff --git a/packages/p2/service/httpd/run b/packages/p2/service/httpd/run
index 5042f67..04af5dd 100755
--- a/packages/p2/service/httpd/run
+++ b/packages/p2/service/httpd/run
@@ -16,5 +16,5 @@ for d in /opt/*; do
     fi
 done
 
-ln -sf /var/www default
-exec tcpsvd -u nobody ${IP%/*} 80 /opt/p2/bin/eris -c
+cd /var/www
+exec tcpsvd -u nobody ${IP%/*} 80 /opt/p2/bin/eris -c.