From aa794b6c23062c47e9a415ce0fd111cf9e09ff67 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Tue, 22 Feb 2011 14:05:51 -0700
Subject: [PATCH] Refresh sequence category

---
 Makefile                               |  8 ++++----
 install.sh                             | 11 +++++++++--
 packages/mkanswer                      |  6 ++++++
 packages/sequence/100/index.mdwn       |  3 ++-
 packages/sequence/100/key              |  4 +++-
 packages/sequence/100/summary          |  2 +-
 packages/sequence/400/index.mdwn       |  2 +-
 packages/sequence/400/key              |  4 +++-
 packages/sequence/400/summary          |  2 +-
 packages/sequence/450/index.mdwn       |  1 -
 packages/sequence/450/key              |  1 -
 packages/sequence/500/index.mdwn       |  1 +
 packages/sequence/500/key              |  1 +
 packages/sequence/{450 => 500}/summary |  0
 14 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100755 packages/mkanswer
 delete mode 100644 packages/sequence/450/index.mdwn
 delete mode 100644 packages/sequence/450/key
 create mode 100644 packages/sequence/500/index.mdwn
 create mode 100644 packages/sequence/500/key
 rename packages/sequence/{450 => 500}/summary (100%)

diff --git a/Makefile b/Makefile
index 39c536f..24dd97e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@ 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
+ctf-install.zip: packages.zip bzImage rootfs.squashfs /usr/lib/syslinux/mbr.bin
+	zip --junk-paths $@ packages.zip bzImage rootfs.squashfs /usr/lib/syslinux/mbr.bin install.sh
 
-packages.zip: packages bzImage rootfs.squashfs
-	zip --junk-paths $@ bin/*.pkg bzImage rootfs.squashfs
+packages.zip: packages
+	zip --junk-paths $@ bin/*.pkg
 
 clean: packages-clean
 	rm -rf $(BUILD) $(TARGET) $(BIN)
diff --git a/install.sh b/install.sh
index 8c4e42e..d63c8a0 100755
--- a/install.sh
+++ b/install.sh
@@ -8,12 +8,14 @@ if ! [ -b "$DRIVE" ]; then
     exit
 fi
 
+size=$(sfdisk -s $DRIVE)
+fatsize=$(expr $size \* 95 / 100)
 
 FATFS=${DRIVE}1
 EXTFS=${DRIVE}2
 
-sfdisk $DRIVE <<EOF
-0,60,6,*
+sfdisk -uB $DRIVE <<EOF
+,$fatsize,6,*
 ,,L
 EOF
 sync
@@ -38,6 +40,11 @@ DEFAULT ctf
 LABEL ctf
   KERNEL bzImage
   INITRD dbtl.squashfs
+
+LABEL dbtl
+  KERNEL bzImage
+  INITRD dbtl.squashfs
+  APPEND packages=disabled
 EOD
 
 cp $(basename $0)/../bin/*.pkg /mnt/ctf-install
diff --git a/packages/mkanswer b/packages/mkanswer
new file mode 100755
index 0000000..3a4bd37
--- /dev/null
+++ b/packages/mkanswer
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+shuf -n 2 /usr/share/dict/words | while read word; do
+    echo -n "$word "
+done
+echo
\ No newline at end of file
diff --git a/packages/sequence/100/index.mdwn b/packages/sequence/100/index.mdwn
index fa4d240..0ee7de4 100644
--- a/packages/sequence/100/index.mdwn
+++ b/packages/sequence/100/index.mdwn
@@ -1 +1,2 @@
-    21 22 25 2a 31 3a _
+    32 33 35 38 3c 41 _ _
+
diff --git a/packages/sequence/100/key b/packages/sequence/100/key
index ea90ee3..d851813 100644
--- a/packages/sequence/100/key
+++ b/packages/sequence/100/key
@@ -1 +1,3 @@
-45
+47 4e
+47 4E
+
diff --git a/packages/sequence/100/summary b/packages/sequence/100/summary
index 0123c4a..1d959df 100644
--- a/packages/sequence/100/summary
+++ b/packages/sequence/100/summary
@@ -1 +1 @@
-Geometric sequence in hex
+f(n) = 0x32 + f(n-1) + n
diff --git a/packages/sequence/400/index.mdwn b/packages/sequence/400/index.mdwn
index 17eea60..a4ba65f 100644
--- a/packages/sequence/400/index.mdwn
+++ b/packages/sequence/400/index.mdwn
@@ -1 +1 @@
-    0000 0001 0011 0010 0110 0111 _
+    45 60 b1 a4 7d _ _
diff --git a/packages/sequence/400/key b/packages/sequence/400/key
index 7d0d318..664a3f3 100644
--- a/packages/sequence/400/key
+++ b/packages/sequence/400/key
@@ -1 +1,3 @@
-0101
+A9 8C
+a9 8c
+
diff --git a/packages/sequence/400/summary b/packages/sequence/400/summary
index 704efe6..2f9532d 100644
--- a/packages/sequence/400/summary
+++ b/packages/sequence/400/summary
@@ -1 +1 @@
-Gray sequence (really awful puzzle)
+f(n) = f(n-1) + 3^n
diff --git a/packages/sequence/450/index.mdwn b/packages/sequence/450/index.mdwn
deleted file mode 100644
index c992165..0000000
--- a/packages/sequence/450/index.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-    04 aa 12 7f 99 03 ed c1 22 __ dc be e1 45 94 
diff --git a/packages/sequence/450/key b/packages/sequence/450/key
deleted file mode 100644
index eeee65e..0000000
--- a/packages/sequence/450/key
+++ /dev/null
@@ -1 +0,0 @@
-05
diff --git a/packages/sequence/500/index.mdwn b/packages/sequence/500/index.mdwn
new file mode 100644
index 0000000..9a2c3d5
--- /dev/null
+++ b/packages/sequence/500/index.mdwn
@@ -0,0 +1 @@
+    04 72 6f 61 64 03 6a 61 dc __ 43 72 6f 77 21 __ 41 6c 62 75 71 75 65 72 71 75 65
diff --git a/packages/sequence/500/key b/packages/sequence/500/key
new file mode 100644
index 0000000..081c7e4
--- /dev/null
+++ b/packages/sequence/500/key
@@ -0,0 +1 @@
+05 09
diff --git a/packages/sequence/450/summary b/packages/sequence/500/summary
similarity index 100%
rename from packages/sequence/450/summary
rename to packages/sequence/500/summary