From 2625f6c5aa69ffd4d60d704efe9f0272cef20729 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 9 Oct 2016 20:13:56 +0100 Subject: [PATCH] Expected location for config file --- src/freedombone-config | 2 +- src/freedombone-image | 4 ++-- src/freedombone-utils-config | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/freedombone-config b/src/freedombone-config index 411e73c7..06889979 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -1362,7 +1362,7 @@ function show_result { } if [ ! $CONFIGURATION_FILE ]; then - CONFIGURATION_FILE='freedombone.cfg' + CONFIGURATION_FILE=/root/freedombone.cfg fi read_configuration_values diff --git a/src/freedombone-image b/src/freedombone-image index 4ab832a4..370687a6 100755 --- a/src/freedombone-image +++ b/src/freedombone-image @@ -362,8 +362,8 @@ done if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL" - if [ -f freedombone.cfg ]; then - CONFIG_FILENAME=freedombone.cfg + if [ -f /root/freedombone.cfg ]; then + CONFIG_FILENAME=/root/freedombone.cfg DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}') fi fi diff --git a/src/freedombone-utils-config b/src/freedombone-utils-config index 9858dc21..24a27ee5 100755 --- a/src/freedombone-utils-config +++ b/src/freedombone-utils-config @@ -145,7 +145,7 @@ function write_config_param { function save_configuration_values { if [ ! $CONFIGURATION_FILE ]; then - CONFIGURATION_FILE='freedombone.cfg' + CONFIGURATION_FILE=/root/freedombone.cfg fi for v in "${configuration_variables[@]}"