From 5611951aefba515a994b1600ff4dd21e5a601cff Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 11 Oct 2011 19:39:34 -0500
Subject: [PATCH 2/3] Move utility scripts to tools/

---
 build_nfs.sh => tools/build_nfs.sh             | 0
 build_pxe_boot.sh => tools/build_pxe_boot.sh   | 2 +-
 build_pxe_ramdisk.sh => tools/build_ramdisk.sh | 1 +
 make_image.sh => tools/make_image.sh           | 0
 upload_image.sh => tools/upload_image.sh       | 0
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename build_nfs.sh => tools/build_nfs.sh (100%)
 rename build_pxe_boot.sh => tools/build_pxe_boot.sh (97%)
 rename build_pxe_ramdisk.sh => tools/build_ramdisk.sh (98%)
 rename make_image.sh => tools/make_image.sh (100%)
 rename upload_image.sh => tools/upload_image.sh (100%)

diff --git a/build_nfs.sh b/tools/build_nfs.sh
similarity index 100%
rename from build_nfs.sh
rename to tools/build_nfs.sh
diff --git a/build_pxe_boot.sh b/tools/build_pxe_boot.sh
similarity index 97%
rename from build_pxe_boot.sh
rename to tools/build_pxe_boot.sh
index 4feb14d2fc..84aa43b44d 100755
--- a/build_pxe_boot.sh
+++ b/tools/build_pxe_boot.sh
@@ -56,7 +56,7 @@ fi
 cp -p $PXEDIR/vmlinuz-${KVER} $DEST_DIR/ubuntu
 if [ ! -r $PXEDIR/stack-initrd.gz ]; then
     cd $OPWD
-    sudo $PROGDIR/build_pxe_ramdisk.sh $PXEDIR/stack-initrd.gz
+    sudo $PROGDIR/build_ramdisk.sh $PXEDIR/stack-initrd.gz
 fi
 cp -p $PXEDIR/stack-initrd.gz $DEST_DIR/ubuntu
 cat >>$DEFAULT <<EOF
diff --git a/build_pxe_ramdisk.sh b/tools/build_ramdisk.sh
similarity index 98%
rename from build_pxe_ramdisk.sh
rename to tools/build_ramdisk.sh
index a01656b122..63d37a9d9b 100755
--- a/build_pxe_ramdisk.sh
+++ b/tools/build_ramdisk.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# build_ramdisk.sh - Build RAM disk images
 
 if [ ! "$#" -eq "1" ]; then
     echo "$0 builds a gziped natty openstack install"
diff --git a/make_image.sh b/tools/make_image.sh
similarity index 100%
rename from make_image.sh
rename to tools/make_image.sh
diff --git a/upload_image.sh b/tools/upload_image.sh
similarity index 100%
rename from upload_image.sh
rename to tools/upload_image.sh

From dd6636be060edb782e09a86364ad3b7db63c7d63 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Tue, 11 Oct 2011 20:28:39 -0500
Subject: [PATCH 3/3] Cleanup PXE boot config

---
 tools/build_pxe_boot.sh | 46 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

diff --git a/tools/build_pxe_boot.sh b/tools/build_pxe_boot.sh
index 84aa43b44d..0653664c0c 100755
--- a/tools/build_pxe_boot.sh
+++ b/tools/build_pxe_boot.sh
@@ -4,15 +4,8 @@
 # build_pxe_boot.sh [-k kernel-version] destdir
 #
 # Assumes syslinux is installed
-# Assumes devstack files are in `pwd`/pxe
 # Only needs to run as root if the destdir permissions require it
 
-UBUNTU_MIRROR=http://archive.ubuntu.com/ubuntu/dists/natty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64
-
-MEMTEST_VER=4.10
-MEMTEST_BIN=memtest86+-${MEMTEST_VER}.bin
-MEMTEST_URL=http://www.memtest.org/download/${MEMTEST_VER}/
-
 KVER=`uname -r`
 if [ "$1" = "-k" ]; then
     KVER=$2
@@ -30,8 +23,8 @@ for i in memdisk menu.c32 pxelinux.0; do
 	cp -p /usr/lib/syslinux/$i $DEST_DIR
 done
 
-DEFAULT=$DEST_DIR/pxelinux.cfg/default
-cat >$DEFAULT <<EOF
+CFG=$DEST_DIR/pxelinux.cfg/default
+cat >$CFG <<EOF
 default menu.c32
 prompt 0
 timeout 0
@@ -59,7 +52,7 @@ if [ ! -r $PXEDIR/stack-initrd.gz ]; then
     sudo $PROGDIR/build_ramdisk.sh $PXEDIR/stack-initrd.gz
 fi
 cp -p $PXEDIR/stack-initrd.gz $DEST_DIR/ubuntu
-cat >>$DEFAULT <<EOF
+cat >>$CFG <<EOF
 
 LABEL devstack
     MENU LABEL ^devstack
@@ -69,48 +62,21 @@ LABEL devstack
 EOF
 
 # Get Ubuntu
-if [ -d $PXEDIR ]; then
+if [ -d $PXEDIR -a -r $PXEDIR/natty-base-initrd.gz ]; then
     cp -p $PXEDIR/natty-base-initrd.gz $DEST_DIR/ubuntu
-fi
-cat >>$DEFAULT <<EOF
+    cat >>$CFG <<EOF
 
 LABEL ubuntu
     MENU LABEL ^Ubuntu Natty
     KERNEL ubuntu/vmlinuz-$KVER
     APPEND initrd=ubuntu/natty-base-initrd.gz ramdisk_size=419600 root=/dev/ram0
 EOF
-
-# Get Memtest
-cd $DEST_DIR
-if [ ! -r $MEMTEST_BIN ]; then
-    wget -N --quiet ${MEMTEST_URL}/${MEMTEST_BIN}.gz
-    gunzip $MEMTEST_BIN
 fi
-cat >>$DEFAULT <<EOF
-
-LABEL memtest
-    MENU LABEL ^Memtest86+
-    KERNEL $MEMTEST_BIN
-EOF
-
-# Get FreeDOS
-mkdir -p $DEST_DIR/freedos
-cd $DEST_DIR/freedos
-wget -N --quiet http://www.fdos.org/bootdisks/autogen/FDSTD.288.gz
-gunzip -f FDSTD.288.gz
-cat >>$DEFAULT <<EOF
-
-LABEL freedos
-	MENU LABEL ^FreeDOS bootdisk
-	KERNEL memdisk
-	APPEND initrd=freedos/FDSTD.288
-EOF
 
 # Local disk boot
-cat >>$DEFAULT <<EOF
+cat >>$CFG <<EOF
 
 LABEL local
     MENU LABEL ^Local disk
-    MENU DEFAULT
     LOCALBOOT 0
 EOF