From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 7 Apr 2006 03:58:07 +0000 (+0000)
Subject: - fix /etc/issue generation
X-Git-Tag: bootcd-3.4-2~87
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=85adffc4792d573815a2a199e604062494b83472

- fix /etc/issue generation
---

diff --git a/build.sh b/build.sh
index 787676f..3e34f53 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: build.sh,v 1.33 2006/04/03 20:07:45 mlhuang Exp $
+# $Id: build.sh,v 1.34 2006/04/07 03:50:08 mlhuang Exp $
 #
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -68,6 +68,9 @@ elif [ -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
@@ -118,10 +121,21 @@ echo "$PLC_BOOT_SSL_PORT" >$overlay/usr/bootme/BOOTPORT
 
 # Generate /etc/issue
 echo "* Generating /etc/issue"
+
+if [ "$PLC_WWW_PORT" = "443" ] ; then
+    PLC_WWW_URL="https://$PLC_WWW_HOST/"
+elif [ "$PLC_WWW_PORT" != "80" ] ; then
+    PLC_WWW_URL="http://$PLC_WWW_HOST:$PLC_WWW_PORT/"
+else
+    PLC_WWW_URL="http://$PLC_WWW_HOST/"
+fi
+
 mkdir -p $overlay/etc
 cat >$overlay/etc/issue <<EOF
+$FULL_VERSION_STRING
 $PLC_NAME Node: \n
 Kernel \r on an \m
+$PLC_WWW_URL
 
 This machine is a node in the $PLC_NAME distributed network.  It has
 not fully booted yet. If you have cancelled the boot process at the
@@ -129,7 +143,8 @@ request of $PLC_NAME Support, please follow the instructions provided
 to you. Otherwise, please contact $PLC_MAIL_SUPPORT_ADDRESS.
 
 Console login at this point is restricted to root. Provide the root
-password of the default $PLC_NAME Central administrator account.
+password of the default $PLC_NAME Central administrator account at the
+time that this CD was created.
 EOF
 
 # Set root password