瀏覽代碼

Can specify local name when creating images

Bob Mottram 7 年之前
父節點
當前提交
a43e7b888e
共有 3 個檔案被更改,包括 10 行新增1 行删除
  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 查看文件

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

+ 1
- 0
src/freedombone-image-customise 查看文件

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

+ 2
- 0
src/freedombone-image-make 查看文件

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