Просмотр исходного кода

Onion-only installations from image

Bob Mottram 9 лет назад
Родитель
Сommit
af30aa2689
2 измененных файлов: 16 добавлений и 5 удалений
  1. 9
    2
      src/freedombone
  2. 7
    3
      src/freedombone-image-customise

+ 9
- 2
src/freedombone Просмотреть файл

@@ -477,7 +477,8 @@ function show_help {
477 477
     echo ''
478 478
     echo $'  -h --help             Show help'
479 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 482
     echo $'  -c --config           Installing from a configuration file'
482 483
     echo $'     --bbb              Installing on Beaglebone Black'
483 484
     echo $'  -u --user             User to install the system as'
@@ -631,11 +632,17 @@ function interactive_configuration {
631 632
 
632 633
 command_options=$1
633 634
 
634
-if [[ $command_options == "menuconfigfull" ]]; then
635
+if [[ $command_options == "menuconfig-full" ]]; then
635 636
     MINIMAL_INSTALL="no"
636 637
     command_options="menuconfig"
637 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 646
 if [[ $command_options == "menuconfig" ]]; then
640 647
     interactive_configuration
641 648
 else

+ 7
- 3
src/freedombone-image-customise Просмотреть файл

@@ -284,10 +284,14 @@ EOF
284 284
     echo "    make install" >> $rootdir/root/.bashrc
285 285
 
286 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 293
         else
290
-            echo "    ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc
294
+            echo "    ${PROJECT_NAME} menuconfig-onion" >> $rootdir/root/.bashrc
291 295
         fi
292 296
     else
293 297
         echo "    ${PROJECT_NAME}-image-mesh" >> $rootdir/root/.bashrc