free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Expected location for config file

This commit is contained in:
Bob Mottram 2016-10-09 20:13:56 +01:00
parent c0983fbc4a
commit 2625f6c5aa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-config
View File

@ -1362,7 +1362,7 @@ function show_result {
}
if [ ! $CONFIGURATION_FILE ]; then
CONFIGURATION_FILE='freedombone.cfg'
CONFIGURATION_FILE=/root/freedombone.cfg
fi
read_configuration_values

4
src/freedombone-image
View File

@ -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

2
src/freedombone-utils-config
View File

@ -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[@]}"