Bläddra i källkod

Expected location for config file

Bob Mottram 8 år sedan
förälder
incheckning
2625f6c5aa
3 ändrade filer med 4 tillägg och 4 borttagningar
  1. 1
    1
      src/freedombone-config
  2. 2
    2
      src/freedombone-image
  3. 1
    1
      src/freedombone-utils-config

+ 1
- 1
src/freedombone-config Visa fil

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

+ 2
- 2
src/freedombone-image Visa fil

@@ -362,8 +362,8 @@ done
362 362
 
363 363
 if [[ $INTERACTIVE == "yes" || $INTERACTIVE == "y" || $INTERACTIVE == "Yes" ]]; then
364 364
     ${PROJECT_NAME}-config --minimal "$MINIMAL_INSTALL"
365
-    if [ -f freedombone.cfg ]; then
366
-        CONFIG_FILENAME=freedombone.cfg
365
+    if [ -f /root/freedombone.cfg ]; then
366
+        CONFIG_FILENAME=/root/freedombone.cfg
367 367
         DEFAULT_DOMAIN_NAME=$(cat $CONFIG_FILENAME | grep 'DEFAULT_DOMAIN_NAME' | awk -F '=' '{print $2}')
368 368
     fi
369 369
 fi

+ 1
- 1
src/freedombone-utils-config Visa fil

@@ -145,7 +145,7 @@ function write_config_param {
145 145
 
146 146
 function save_configuration_values {
147 147
     if [ ! $CONFIGURATION_FILE ]; then
148
-        CONFIGURATION_FILE='freedombone.cfg'
148
+        CONFIGURATION_FILE=/root/freedombone.cfg
149 149
     fi
150 150
 
151 151
     for v in "${configuration_variables[@]}"