Browse Source

Onion-only installations from image

Bob Mottram 9 years ago
parent
commit
af30aa2689
2 changed files with 16 additions and 5 deletions
  1. 9
    2
      src/freedombone
  2. 7
    3
      src/freedombone-image-customise

+ 9
- 2
src/freedombone View File

477
     echo ''
477
     echo ''
478
     echo $'  -h --help             Show help'
478
     echo $'  -h --help             Show help'
479
     echo $'     menuconfig         Easy interactive installation'
479
     echo $'     menuconfig         Easy interactive installation'
480
-    echo $'     menuconfigfull     Full interactive installation'
480
+    echo $'     menuconfig-full    Full interactive installation'
481
+    echo $'     menuconfig-onion   Interactive installation for onion-only sites'
481
     echo $'  -c --config           Installing from a configuration file'
482
     echo $'  -c --config           Installing from a configuration file'
482
     echo $'     --bbb              Installing on Beaglebone Black'
483
     echo $'     --bbb              Installing on Beaglebone Black'
483
     echo $'  -u --user             User to install the system as'
484
     echo $'  -u --user             User to install the system as'
631
 
632
 
632
 command_options=$1
633
 command_options=$1
633
 
634
 
634
-if [[ $command_options == "menuconfigfull" ]]; then
635
+if [[ $command_options == "menuconfig-full" ]]; then
635
     MINIMAL_INSTALL="no"
636
     MINIMAL_INSTALL="no"
636
     command_options="menuconfig"
637
     command_options="menuconfig"
637
 fi
638
 fi
638
 
639
 
640
+if [[ $command_options == "menuconfig-onion" ]]; then
641
+    MINIMAL_INSTALL="yes"
642
+    ONION_ONLY="yes"
643
+    command_options="menuconfig"
644
+fi
645
+
639
 if [[ $command_options == "menuconfig" ]]; then
646
 if [[ $command_options == "menuconfig" ]]; then
640
     interactive_configuration
647
     interactive_configuration
641
 else
648
 else

+ 7
- 3
src/freedombone-image-customise View File

284
     echo "    make install" >> $rootdir/root/.bashrc
284
     echo "    make install" >> $rootdir/root/.bashrc
285
 
285
 
286
     if [[ $VARIANT != "mesh" ]]; then
286
     if [[ $VARIANT != "mesh" ]]; then
287
-        if [[ $MINIMAL_INSTALL == "no" ]]; then
288
-            echo "    ${PROJECT_NAME} menuconfigfull" >> $rootdir/root/.bashrc
287
+        if [[ $ONION_ONLY == "no" ]]; then
288
+            if [[ $MINIMAL_INSTALL == "no" ]]; then
289
+                echo "    ${PROJECT_NAME} menuconfig-full" >> $rootdir/root/.bashrc
290
+            else
291
+                echo "    ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc
292
+            fi
289
         else
293
         else
290
-            echo "    ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc
294
+            echo "    ${PROJECT_NAME} menuconfig-onion" >> $rootdir/root/.bashrc
291
         fi
295
         fi
292
     else
296
     else
293
         echo "    ${PROJECT_NAME}-image-mesh" >> $rootdir/root/.bashrc
297
         echo "    ${PROJECT_NAME}-image-mesh" >> $rootdir/root/.bashrc