Kaynağa Gözat

More mesh amnesia

Bob Mottram 9 yıl önce
ebeveyn
işleme
3f5598f63b

BIN
man/freedombone-image.1.gz Dosyayı Görüntüle


+ 10
- 1
src/freedombone-image Dosyayı Görüntüle

114
 # Whether to install non-free wifi drivers for the mesh client
114
 # Whether to install non-free wifi drivers for the mesh client
115
 INSECURE='no'
115
 INSECURE='no'
116
 
116
 
117
+# for mesh installs whether to delete all data and generate
118
+# a new identity at every shutdown/boot
119
+AMNESIC='no'
120
+
117
 mesh_router_setup_script() {
121
 mesh_router_setup_script() {
118
 	# create a setup script for a mesh router
122
 	# create a setup script for a mesh router
119
 	mesh_script_filename=$1
123
 	mesh_script_filename=$1
223
 			shift
227
 			shift
224
 			ONION_ONLY="$1"
228
 			ONION_ONLY="$1"
225
 			;;
229
 			;;
230
+		-a|--amnesic)
231
+			shift
232
+			ONION_ONLY="$1"
233
+			;;
226
 		-r|--repo|--repository)
234
 		-r|--repo|--repository)
227
 			shift
235
 			shift
228
 			PROJECT_REPO="$1"
236
 			PROJECT_REPO="$1"
385
 	 WIFI_NETWORKS_FILE="$WIFI_NETWORKS_FILE" \
393
 	 WIFI_NETWORKS_FILE="$WIFI_NETWORKS_FILE" \
386
 	 VARIANT="$VARIANT" \
394
 	 VARIANT="$VARIANT" \
387
 	 MINIMUM_PASSWORD_LENGTH="$MINIMUM_PASSWORD_LENGTH" \
395
 	 MINIMUM_PASSWORD_LENGTH="$MINIMUM_PASSWORD_LENGTH" \
388
-	 INSECURE="$INSECURE"
396
+	 INSECURE="$INSECURE" \
397
+	 AMNESIC="$AMNESIC"
389
 
398
 
390
 if [ ! "$?" = "0" ]; then
399
 if [ ! "$?" = "0" ]; then
391
 	echo $'Build failed'
400
 	echo $'Build failed'

+ 10
- 1
src/freedombone-image-customise Dosyayı Görüntüle

102
 
102
 
103
 MESH_INSTALL_DIR=/var/lib
103
 MESH_INSTALL_DIR=/var/lib
104
 
104
 
105
+# for mesh installs whether to delete all data and generate
106
+# a new identity at every shutdown/boot
107
+AMNESIC='no'
108
+
105
 enable_eatmydata_override() {
109
 enable_eatmydata_override() {
106
 	chroot $rootdir apt-get install --no-install-recommends -y eatmydata
110
 	chroot $rootdir apt-get install --no-install-recommends -y eatmydata
107
 	if [ -x $rootdir/usr/bin/eatmydata ] && \
111
 	if [ -x $rootdir/usr/bin/eatmydata ] && \
536
 	MESH_SERVICE='mesh-setup.service'
540
 	MESH_SERVICE='mesh-setup.service'
537
 	MESH_SETUP_DAEMON=$rootdir/etc/systemd/system/$MESH_SERVICE
541
 	MESH_SETUP_DAEMON=$rootdir/etc/systemd/system/$MESH_SERVICE
538
 
542
 
543
+    MESH_STARTUP_PARAMS="${MY_USERNAME}"
544
+	if [[ $AMNESIC != 'no' ]]; then
545
+		MESH_STARTUP_PARAMS="${MY_USERNAME} amnesic"
546
+	fi
547
+
539
 	echo '[Unit]' > $MESH_SETUP_DAEMON
548
 	echo '[Unit]' > $MESH_SETUP_DAEMON
540
 	echo 'Description=Initial mesh router configuration' >> $MESH_SETUP_DAEMON
549
 	echo 'Description=Initial mesh router configuration' >> $MESH_SETUP_DAEMON
541
 	echo 'After=syslog.target' >> $MESH_SETUP_DAEMON
550
 	echo 'After=syslog.target' >> $MESH_SETUP_DAEMON
545
 	echo 'User=root' >> $MESH_SETUP_DAEMON
554
 	echo 'User=root' >> $MESH_SETUP_DAEMON
546
 	echo 'Group=root' >> $MESH_SETUP_DAEMON
555
 	echo 'Group=root' >> $MESH_SETUP_DAEMON
547
 	echo 'WorkingDirectory=/root' >> $MESH_SETUP_DAEMON
556
 	echo 'WorkingDirectory=/root' >> $MESH_SETUP_DAEMON
548
-	echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-image-mesh ${MY_USERNAME} > /var/log/mesh-setup.log" >> $MESH_SETUP_DAEMON
557
+	echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-image-mesh ${MESH_STARTUP_PARAMS} > /var/log/mesh-setup.log" >> $MESH_SETUP_DAEMON
549
 	echo '' >> $MESH_SETUP_DAEMON
558
 	echo '' >> $MESH_SETUP_DAEMON
550
 	echo 'TimeoutSec=99999' >> $MESH_SETUP_DAEMON
559
 	echo 'TimeoutSec=99999' >> $MESH_SETUP_DAEMON
551
 	echo '' >> $MESH_SETUP_DAEMON
560
 	echo '' >> $MESH_SETUP_DAEMON

+ 2
- 0
src/freedombone-image-make Dosyayı Görüntüle

71
 export VARIANT
71
 export VARIANT
72
 export MINIMUM_PASSWORD_LENGTH
72
 export MINIMUM_PASSWORD_LENGTH
73
 export INSECURE
73
 export INSECURE
74
+export AMNESIC
74
 
75
 
75
 # Locate vmdebootstrap program fetched in Makefile
76
 # Locate vmdebootstrap program fetched in Makefile
76
 basedir=`pwd`
77
 basedir=`pwd`
222
 sed -i "s|VARIANT=.*|VARIANT=\"${VARIANT}\"|g" $TEMP_CUSTOMISE3
223
 sed -i "s|VARIANT=.*|VARIANT=\"${VARIANT}\"|g" $TEMP_CUSTOMISE3
223
 sed -i "s|MINIMUM_PASSWORD_LENGTH=.*|MINIMUM_PASSWORD_LENGTH=\"${MINIMUM_PASSWORD_LENGTH}\"|g" $TEMP_CUSTOMISE3
224
 sed -i "s|MINIMUM_PASSWORD_LENGTH=.*|MINIMUM_PASSWORD_LENGTH=\"${MINIMUM_PASSWORD_LENGTH}\"|g" $TEMP_CUSTOMISE3
224
 sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" $TEMP_CUSTOMISE3
225
 sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" $TEMP_CUSTOMISE3
226
+sed -i "s|AMNESIC=.*|AMNESIC=\"${AMNESIC}\"|g" $TEMP_CUSTOMISE3
225
 sed -i 's|#!/bin/bash||g' $TEMP_CUSTOMISE3
227
 sed -i 's|#!/bin/bash||g' $TEMP_CUSTOMISE3
226
 
228
 
227
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4
229
 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4