瀏覽代碼

Set variant during image build

Bob Mottram 9 年之前
父節點
當前提交
a83bf3e8ca
共有 3 個文件被更改,包括 7 次插入2 次删除
  1. 2
    1
      src/freedombone-image
  2. 3
    1
      src/freedombone-image-customise
  3. 2
    0
      src/freedombone-image-make

+ 2
- 1
src/freedombone-image 查看文件

362
 	 WIFI_TYPE="$WIFI_TYPE" \
362
 	 WIFI_TYPE="$WIFI_TYPE" \
363
 	 WIFI_PASSPHRASE="$WIFI_PASSPHRASE" \
363
 	 WIFI_PASSPHRASE="$WIFI_PASSPHRASE" \
364
 	 WIFI_HOTSPOT="$WIFI_HOTSPOT" \
364
 	 WIFI_HOTSPOT="$WIFI_HOTSPOT" \
365
-	 WIFI_NETWORKS_FILE="$WIFI_NETWORKS_FILE"
365
+	 WIFI_NETWORKS_FILE="$WIFI_NETWORKS_FILE" \
366
+	 VARIANT="$VARIANT"
366
 	 
367
 	 
367
 if [ ! "$?" = "0" ]; then
368
 if [ ! "$?" = "0" ]; then
368
 	echo $'Build failed'
369
 	echo $'Build failed'

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

35
 
35
 
36
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
36
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
37
 
37
 
38
+VARIANT='full'
39
+
38
 # username created by default within a debian image
40
 # username created by default within a debian image
39
 GENERIC_IMAGE_USERNAME='fbone'
41
 GENERIC_IMAGE_USERNAME='fbone'
40
 
42
 
230
 	if [[ $GENERIC_IMAGE == "no" ]]; then
232
 	if [[ $GENERIC_IMAGE == "no" ]]; then
231
 		return
233
 		return
232
 	fi
234
 	fi
233
-	VARIANT="full"
234
 	if [ $CONFIG_FILENAME ]; then
235
 	if [ $CONFIG_FILENAME ]; then
235
 		if [[ "$CONFIG_FILENAME" == *"mesh.cfg"* ]]; then
236
 		if [[ "$CONFIG_FILENAME" == *"mesh.cfg"* ]]; then
236
 			VARIANT="mesh"
237
 			VARIANT="mesh"
888
 	if [[ $VARIANT != "mesh" || $DEBIAN_INSTALL_ONLY != "no" ]]; then
889
 	if [[ $VARIANT != "mesh" || $DEBIAN_INSTALL_ONLY != "no" ]]; then
889
 		return
890
 		return
890
 	fi
891
 	fi
892
+
891
 	mesh_firewall
893
 	mesh_firewall
892
 	mesh_avahi
894
 	mesh_avahi
893
 	mesh_batman
895
 	mesh_batman

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

62
 export WIFI_PASSPHRASE
62
 export WIFI_PASSPHRASE
63
 export WIFI_HOTSPOT
63
 export WIFI_HOTSPOT
64
 export WIFI_NETWORKS_FILE
64
 export WIFI_NETWORKS_FILE
65
+export VARIANT
65
 
66
 
66
 # Locate vmdebootstrap program fetched in Makefile
67
 # Locate vmdebootstrap program fetched in Makefile
67
 basedir=`pwd`
68
 basedir=`pwd`
183
 sudo sed -i "s|WIFI_PASSPHRASE=.*|WIFI_PASSPHRASE=\"${WIFI_PASSPHRASE}\"|g" $TEMP_CUSTOMISE
184
 sudo sed -i "s|WIFI_PASSPHRASE=.*|WIFI_PASSPHRASE=\"${WIFI_PASSPHRASE}\"|g" $TEMP_CUSTOMISE
184
 sudo sed -i "s|WIFI_HOTSPOT=.*|WIFI_HOTSPOT=\"${WIFI_HOTSPOT}\"|g" $TEMP_CUSTOMISE
185
 sudo sed -i "s|WIFI_HOTSPOT=.*|WIFI_HOTSPOT=\"${WIFI_HOTSPOT}\"|g" $TEMP_CUSTOMISE
185
 sudo sed -i "s|WIFI_NETWORKS_FILE=.*|WIFI_NETWORKS_FILE=\"${WIFI_NETWORKS_FILE}\"|g" $TEMP_CUSTOMISE
186
 sudo sed -i "s|WIFI_NETWORKS_FILE=.*|WIFI_NETWORKS_FILE=\"${WIFI_NETWORKS_FILE}\"|g" $TEMP_CUSTOMISE
187
+sudo sed -i "s|VARIANT=.*|VARIANT=\"${VARIANT}\"|g" $TEMP_CUSTOMISE
186
 
188
 
187
 echo $"starting $VMDEBOOTSTRAP"
189
 echo $"starting $VMDEBOOTSTRAP"
188
 # Run vmdebootstrap script to create image
190
 # Run vmdebootstrap script to create image