Onion-only installations from image

This commit is contained in:
Bob Mottram 2015-12-31 13:21:46 +00:00
parent f686f891fc
commit af30aa2689
2 changed files with 16 additions and 5 deletions

View File

@ -477,7 +477,8 @@ function show_help {
echo '' echo ''
echo $' -h --help Show help' echo $' -h --help Show help'
echo $' menuconfig Easy interactive installation' 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 $' -c --config Installing from a configuration file'
echo $' --bbb Installing on Beaglebone Black' echo $' --bbb Installing on Beaglebone Black'
echo $' -u --user User to install the system as' echo $' -u --user User to install the system as'
@ -631,11 +632,17 @@ function interactive_configuration {
command_options=$1 command_options=$1
if [[ $command_options == "menuconfigfull" ]]; then if [[ $command_options == "menuconfig-full" ]]; then
MINIMAL_INSTALL="no" MINIMAL_INSTALL="no"
command_options="menuconfig" command_options="menuconfig"
fi fi
if [[ $command_options == "menuconfig-onion" ]]; then
MINIMAL_INSTALL="yes"
ONION_ONLY="yes"
command_options="menuconfig"
fi
if [[ $command_options == "menuconfig" ]]; then if [[ $command_options == "menuconfig" ]]; then
interactive_configuration interactive_configuration
else else

View File

@ -284,11 +284,15 @@ EOF
echo " make install" >> $rootdir/root/.bashrc echo " make install" >> $rootdir/root/.bashrc
if [[ $VARIANT != "mesh" ]]; then if [[ $VARIANT != "mesh" ]]; then
if [[ $ONION_ONLY == "no" ]]; then
if [[ $MINIMAL_INSTALL == "no" ]]; then if [[ $MINIMAL_INSTALL == "no" ]]; then
echo " ${PROJECT_NAME} menuconfigfull" >> $rootdir/root/.bashrc echo " ${PROJECT_NAME} menuconfig-full" >> $rootdir/root/.bashrc
else else
echo " ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc echo " ${PROJECT_NAME} menuconfig" >> $rootdir/root/.bashrc
fi fi
else
echo " ${PROJECT_NAME} menuconfig-onion" >> $rootdir/root/.bashrc
fi
else else
echo " ${PROJECT_NAME}-image-mesh" >> $rootdir/root/.bashrc echo " ${PROJECT_NAME}-image-mesh" >> $rootdir/root/.bashrc
fi fi