From 2b6c3005f7f9fd6a1d9fcfbb08916ca4f9b7fe48 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Thu, 2 Feb 2012 17:14:41 -0700
Subject: [PATCH] install fixes, tweak playfair

---
 install.sh                       | 6 +++---
 packages/playfair/src/playfair.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index c1c4e8c..5573b7b 100755
--- a/install.sh
+++ b/install.sh
@@ -32,8 +32,6 @@ 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
@@ -47,8 +45,10 @@ LABEL dbtl
   APPEND packages=disabled
 EOD
 
+cp rootfs.squashfs /mnt/ctf-install/syslinux/dbtl.squashfs
+cp bzImage /mnt/ctf-install/syslinux/
 cp $(dirname $0)/bin/*.pkg /mnt/ctf-install/disabled/
-mv /mnt/ctf-install/disabled/ctfbase.pkg /mnt/ctf-install/
+mv /mnt/ctf-install/disabled/00admin.pkg /mnt/ctf-install/
 umount /mnt/ctf-install
 rmdir /mnt/ctf-install
 
diff --git a/packages/playfair/src/playfair.c b/packages/playfair/src/playfair.c
index bb0749f..64a4da5 100644
--- a/packages/playfair/src/playfair.c
+++ b/packages/playfair/src/playfair.c
@@ -193,7 +193,7 @@ main() {
 
   // All I know about trigraphs is that the gcc manual says I don't want
   // to know about trigraphs.
-  printf("The key is the token.  ???:????\?-???\?-????\n");
+  printf("The key is the token.  Play fair.  ???:????\?-???\?-????\n");
   fflush(stdout);
   run(ckey);
 }