Browse Source

Can specify local name when creating images

Bob Mottram 8 years ago
parent
commit
a43e7b888e
3 changed files with 10 additions and 1 deletions
  1. 7
    1
      src/freedombone-image
  2. 1
    0
      src/freedombone-image-customise
  3. 2
    0
      src/freedombone-image-make

+ 7
- 1
src/freedombone-image View File

450
             image_setup "$1"
450
             image_setup "$1"
451
             exit 0
451
             exit 0
452
             ;;
452
             ;;
453
+        --local|--localname)
454
+            shift
455
+            LOCAL_NAME="$1"
456
+            exit 0
457
+            ;;
453
         *)
458
         *)
454
             # unknown option
459
             # unknown option
455
             ;;
460
             ;;
592
      MINIMUM_PASSWORD_LENGTH="$MINIMUM_PASSWORD_LENGTH" \
597
      MINIMUM_PASSWORD_LENGTH="$MINIMUM_PASSWORD_LENGTH" \
593
      INSECURE="$INSECURE" \
598
      INSECURE="$INSECURE" \
594
      AMNESIC="$AMNESIC" \
599
      AMNESIC="$AMNESIC" \
595
-     SOCIALINSTANCE="$SOCIALINSTANCE"
600
+     SOCIALINSTANCE="$SOCIALINSTANCE" \
601
+     LOCAL_NAME="$LOCAL_NAME"
596
 
602
 
597
 if [ ! "$?" = "0" ]; then
603
 if [ ! "$?" = "0" ]; then
598
     echo $'Build failed'
604
     echo $'Build failed'

+ 1
- 0
src/freedombone-image-customise View File

30
 set -x
30
 set -x
31
 
31
 
32
 PROJECT_NAME='freedombone'
32
 PROJECT_NAME='freedombone'
33
+LOCAL_NAME=${PROJECT_NAME}
33
 INSTALL_DIR=/root/build
34
 INSTALL_DIR=/root/build
34
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
35
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
35
 
36
 

+ 2
- 0
src/freedombone-image-make View File

78
 export INSECURE
78
 export INSECURE
79
 export AMNESIC
79
 export AMNESIC
80
 export SOCIALINSTANCE
80
 export SOCIALINSTANCE
81
+export LOCAL_NAME
81
 
82
 
82
 # Locate vmdebootstrap program fetched in Makefile
83
 # Locate vmdebootstrap program fetched in Makefile
83
 basedir=`pwd`
84
 basedir=`pwd`
243
 sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" $TEMP_CUSTOMISE3
244
 sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" $TEMP_CUSTOMISE3
244
 sed -i "s|AMNESIC=.*|AMNESIC=\"${AMNESIC}\"|g" $TEMP_CUSTOMISE3
245
 sed -i "s|AMNESIC=.*|AMNESIC=\"${AMNESIC}\"|g" $TEMP_CUSTOMISE3
245
 sed -i "s|SOCIALINSTANCE=.*|SOCIALINSTANCE=\"${SOCIALINSTANCE}\"|g" $TEMP_CUSTOMISE3
246
 sed -i "s|SOCIALINSTANCE=.*|SOCIALINSTANCE=\"${SOCIALINSTANCE}\"|g" $TEMP_CUSTOMISE3
247
+sed -i "s|LOCAL_NAME=.*|LOCAL_NAME=\"${LOCAL_NAME}\"|g" $TEMP_CUSTOMISE3
246
 sed -i 's|#!/bin/bash||g' $TEMP_CUSTOMISE3
248
 sed -i 's|#!/bin/bash||g' $TEMP_CUSTOMISE3
247
 
249
 
248
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
250
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4