Refresh sequence category

2011-02-22 14:05:51 -07:00 · 2011-02-22 14:05:51 -07:00 · aa794b6c23
parent 437a688499
commit aa794b6c23
14 changed files with 32 additions and 14 deletions
--- a/8
+++ b/8
@ -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)
--- 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
--- a/packages/mkanswer
+++ 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
--- 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 _ _
+
--- a/packages/sequence/100/key
+++ b/packages/sequence/100/key
@ -1 +1,3 @@
-45
+47 4e
+47 4E
+
--- a/packages/sequence/100/summary
+++ b/packages/sequence/100/summary
@ -1 +1 @@
-Geometric sequence in hex
+f(n) = 0x32 + f(n-1) + n
--- 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 _ _
--- a/packages/sequence/400/key
+++ b/packages/sequence/400/key
@ -1 +1,3 @@
-0101
+A9 8C
+a9 8c
+
--- a/packages/sequence/400/summary
+++ b/packages/sequence/400/summary
@ -1 +1 @@
-Gray sequence (really awful puzzle)
+f(n) = f(n-1) + 3^n
--- a/packages/sequence/450/index.mdwn
+++ b/packages/sequence/450/index.mdwn
@ -1 +0,0 @@
-    04 aa 12 7f 99 03 ed c1 22 __ dc be e1 45 94 
--- a/packages/sequence/450/key
+++ b/packages/sequence/450/key
@ -1 +0,0 @@
-05
--- a/packages/sequence/500/index.mdwn
+++ 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
--- a/packages/sequence/500/key
+++ b/packages/sequence/500/key
@ -0,0 +1 @@
+05 09
--- a/packages/sequence/500/summary
+++ b/packages/sequence/500/summary
				`@ -1 +0,0 @@`
				`04 aa 12 7f 99 03 ed c1 22 __ dc be e1 45 94`
				`@ -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`