From af30aa268953aae4a42472bd6c69aa8edc176528 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 31 Dec 2015 13:21:46 +0000 Subject: [PATCH] Onion-only installations from image --- src/freedombone | 11 +++++++++-- src/freedombone-image-customise | 10 +++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/freedombone b/src/freedombone index 00040cfb..9f6fb447 100755 --- a/src/freedombone +++ b/src/freedombone @@ -477,7 +477,8 @@ function show_help { echo '' echo $' -h --help Show help' echo $' menuconfig Easy interactive installation' - echo $' menuconfigfull Full interactive installation' + echo $' menuconfig-full Full interactive installation' + echo $' menuconfig-onion Interactive installation for onion-only sites' echo $' -c --config Installing from a configuration file' echo $' --bbb Installing on Beaglebone Black' echo $' -u --user User to install the system as' @@ -631,11 +632,17 @@ function interactive_configuration { command_options=$1 -if [[ $command_options == "menuconfigfull" ]]; then +if [[ $command_options == "menuconfig-full" ]]; then MINIMAL_INSTALL="no" command_options="menuconfig" fi +if [[ $command_options == "menuconfig-onion" ]]; then + MINIMAL_INSTALL="yes" + ONION_ONLY="yes" + command_options="menuconfig" +fi + if [[ $command_options == "menuconfig" ]]; then interactive_configuration else diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 09829499..43d517b1 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -284,10 +284,14 @@ EOF echo " make install" >> $rootdir/root/.bashrc if [[ $VARIANT != "mesh" ]]; then - if [[ $MINIMAL_INSTALL == "no" ]]; then - echo " ${PROJECT_NAME} menuconfigfull" >> $rootdir/root/.bashrc + if [[ $ONION_ONLY == "no" ]]; then + if [[ $MINIMAL_INSTALL == "no" ]]; then + echo " ${PROJECT_NAME} menuconfig-full" >> $rootdir/root/.bashrc + else + echo " ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc + fi else - echo " ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc + echo " ${PROJECT_NAME} menuconfig-onion" >> $rootdir/root/.bashrc fi else echo " ${PROJECT_NAME}-image-mesh" >> $rootdir/root/.bashrc