remove empty dir

[bootcd.git] / build.sh

diff --git a/build.sh b/build.sh
index 3553c89..763f0be 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 #
 # Builds custom BootCD ISO and USB images in the current
-# directory. For backward compatibility, if an old-style static
-# configuration is specified, that configuration file will be parsed
-# instead of the current PLC configuration in
-# /etc/planetlab/plc_config.
+# directory. 
 #
 # Aaron Klingaman <alk@absarokasoft.com>
 # Mark Huang <mlhuang@cs.princeton.edu>
@@ -50,7 +47,6 @@ done; done; done
 usage()
 {
     echo "Usage: build.sh [OPTION]..."
-    echo "    -c name          (Deprecated) Static configuration to use (default: $CONFIGURATION)"
     echo "    -f plnode.txt    Node to customize CD for (default: none)"
     echo "    -t 'types'       Build the specified images (default: $DEFAULT_TYPES)"
     echo "    -a               Build all known types as listed below"
@@ -72,10 +68,8 @@ usage()
 # init
 TYPES=""
 # Get options
-while getopts "c:f:t:as:O:o:C:nh" opt ; do
+while getopts "f:t:as:O:o:C:nh" opt ; do
     case $opt in
-    c)
-        CONFIGURATION=$OPTARG ;;
     f)
         NODE_CONFIGURATION_FILE=$OPTARG ;;
     t)
@@ -128,31 +122,6 @@ if [ -f /etc/planetlab/plc_config ] ; then
     . /etc/planetlab/plc_config
 fi
 
-### This support for backwards compatibility can be taken out in the
-### future. RC1 based MyPLCs set $PLC_BOOT_SSL_CRT in the plc_config
-### file, but >=RC2 based bootcd assumes that $PLC_BOOT_CA_SSL_CRT is
-### set.
-if [ -z "$PLC_BOOT_CA_SSL_CRT" -a ! -z "$PLC_BOOT_SSL_CRT" ] ; then
-    PLC_BOOT_CA_SSL_CRT=$PLC_BOOT_SSL_CRT
-fi
-
-# If PLC configuration is not valid, try a static configuration
-if [ -z "$PLC_BOOT_CA_SSL_CRT" -a -d configurations/$CONFIGURATION ] ; then
-    # (Deprecated) Source static configuration
-    . configurations/$CONFIGURATION/configuration
-    PLC_NAME="PlanetLab"
-    PLC_MAIL_SUPPORT_ADDRESS="support@planet-lab.org"
-    PLC_WWW_HOST="www.planet-lab.org"
-    PLC_WWW_PORT=80
-    if [ -n "$EXTRA_VERSION" ] ; then
-    BOOTCD_VERSION="$BOOTCD_VERSION $EXTRA_VERSION"
-    fi
-    PLC_BOOT_HOST=$PRIMARY_SERVER
-    PLC_BOOT_SSL_PORT=$PRIMARY_SERVER_PORT
-    PLC_BOOT_CA_SSL_CRT=configurations/$CONFIGURATION/$PRIMARY_SERVER_CERT
-    PLC_ROOT_GPG_KEY_PUB=configurations/$CONFIGURATION/$PRIMARY_SERVER_GPG
-fi
-
 FULL_VERSION_STRING="${PLC_NAME} BootCD ${BOOTCD_VERSION}"
 
 echo "* Building images for $FULL_VERSION_STRING"
@@ -230,7 +199,9 @@ for dir in $overlay/usr/boot $overlay/usr/boot/backup ; do
     echo "/boot/" >$dir/boot_server_path
 done
 
-# (Deprecated) Install old-style boot server configuration files
+# Install old-style boot server configuration files
+# as opposed to what a former comment suggested, 
+# this is still required, somewhere in the bootmanager apparently
 install -D -m 644 $PLC_BOOT_CA_SSL_CRT $overlay/usr/bootme/cacert/$PLC_BOOT_HOST/cacert.pem
 echo "$FULL_VERSION_STRING" >$overlay/usr/bootme/ID
 echo "$PLC_BOOT_HOST" >$overlay/usr/bootme/BOOTSERVER
@@ -364,6 +335,11 @@ APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom
 DISPLAY pl_version
 PROMPT 0
 TIMEOUT 40
+EOF
+
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    cat >$isofs/kargs.txt <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
 EOF
 
     # Create ISO image
@@ -455,6 +431,14 @@ function build_usb()
 
     mkfs.vfat -C "$usb" $(($(du -Lsk $isofs | awk '{ print $1; }') + $FREE_SPACE))
 
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    tmp="${BUILDTMP}/kargs.txt"
+    cat >$tmp <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
+EOF
+    mcopy -i "$usb" "$tmp" ::/kargs.txt
+    rm -f "$tmp"
+
     # Populate it
     echo -n " populating USB image... "
     mcopy -bsQ -i "$usb" "$isofs"/* ::/
@@ -644,6 +628,11 @@ APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${serial:+c
 DISPLAY pl_version
 PROMPT 0
 TIMEOUT 40
+EOF
+
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    cat >$tmp/kargs.txt <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
 EOF
 
     cp ${BUILDTMP}/cramfs.img $tmp
@@ -678,6 +667,14 @@ function build_usb_cramfs()
     # Make VFAT filesystem for USB
     mkfs.vfat -C "$usb" $vfat_size
 
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    tmp="${BUILDTMP}/kargs.txt"
+    cat >$tmp <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
+EOF
+    mcopy -i "$usb" "$tmp" ::/kargs.txt
+    rm -f "$tmp"
+
     # Populate it
     echo "* Populating USB with overlay images and cramfs"
     mcopy -bsQ -i "$usb" $isofs/kernel $isofs/pl_version ::/
@@ -693,6 +690,7 @@ DISPLAY pl_version
 PROMPT 0
 TIMEOUT 40
 EOF
+
     mcopy -bsQ -i "$usb" "$tmp" ::/syslinux.cfg
     rm -f "$tmp"