Can specify local name when creating images

This commit is contained in:
Bob Mottram 2017-06-22 12:34:07 +01:00
parent 5b5bc5cff6
commit a43e7b888e
3 changed files with 10 additions and 1 deletions

View File

@ -450,6 +450,11 @@ do
image_setup "$1"
exit 0
;;
--local|--localname)
shift
LOCAL_NAME="$1"
exit 0
;;
*)
# unknown option
;;
@ -592,7 +597,8 @@ make $IMAGE_TYPE \
MINIMUM_PASSWORD_LENGTH="$MINIMUM_PASSWORD_LENGTH" \
INSECURE="$INSECURE" \
AMNESIC="$AMNESIC" \
SOCIALINSTANCE="$SOCIALINSTANCE"
SOCIALINSTANCE="$SOCIALINSTANCE" \
LOCAL_NAME="$LOCAL_NAME"
if [ ! "$?" = "0" ]; then
echo $'Build failed'

View File

@ -30,6 +30,7 @@ set -e
set -x
PROJECT_NAME='freedombone'
LOCAL_NAME=${PROJECT_NAME}
INSTALL_DIR=/root/build
COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt

View File

@ -78,6 +78,7 @@ export MINIMUM_PASSWORD_LENGTH
export INSECURE
export AMNESIC
export SOCIALINSTANCE
export LOCAL_NAME
# Locate vmdebootstrap program fetched in Makefile
basedir=`pwd`
@ -243,6 +244,7 @@ sed -i "s|MINIMUM_PASSWORD_LENGTH=.*|MINIMUM_PASSWORD_LENGTH=\"${MINIMUM_PASSWOR
sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" $TEMP_CUSTOMISE3
sed -i "s|AMNESIC=.*|AMNESIC=\"${AMNESIC}\"|g" $TEMP_CUSTOMISE3
sed -i "s|SOCIALINSTANCE=.*|SOCIALINSTANCE=\"${SOCIALINSTANCE}\"|g" $TEMP_CUSTOMISE3
sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" $TEMP_CUSTOMISE3
sed -i 's|#!/bin/bash||g' $TEMP_CUSTOMISE3
cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4