|
@@ -58,6 +58,9 @@ DOMAIN_NAME=
|
58
|
58
|
MY_USERNAME=
|
59
|
59
|
SYSTEM_TYPE=$VARIANT_FULL
|
60
|
60
|
|
|
61
|
+# whether the system is being installed from a pre-created configuration file
|
|
62
|
+INSTALLING_FROM_CONFIGURATION_FILE="no"
|
|
63
|
+
|
61
|
64
|
# An optional configuration file which overrides some of these variables
|
62
|
65
|
CONFIGURATION_FILE="freedombone.cfg"
|
63
|
66
|
|
|
@@ -354,6 +357,7 @@ function show_help {
|
354
|
357
|
echo ''
|
355
|
358
|
echo ' -h --help Show help'
|
356
|
359
|
echo ' menuconfig Easy interactive installation'
|
|
360
|
+ echo ' -c --config Installing from a configuration file'
|
357
|
361
|
echo ' --bbb Installing on Beaglebone Black'
|
358
|
362
|
echo ' -u --user User to install the system as'
|
359
|
363
|
echo ' -d --domain Default domain name'
|
|
@@ -508,6 +512,13 @@ else
|
508
|
512
|
-h|--help)
|
509
|
513
|
show_help
|
510
|
514
|
;;
|
|
515
|
+ # load a configuration file
|
|
516
|
+ -c|--config)
|
|
517
|
+ shift
|
|
518
|
+ CONFIGURATION_FILE="$1"
|
|
519
|
+ INSTALLING_FROM_CONFIGURATION_FILE="yes"
|
|
520
|
+ break
|
|
521
|
+ ;;
|
511
|
522
|
# username within /home
|
512
|
523
|
-u|--user)
|
513
|
524
|
shift
|
|
@@ -696,6 +707,13 @@ function read_configuration {
|
696
|
707
|
fi
|
697
|
708
|
fi
|
698
|
709
|
|
|
710
|
+ if [[ $INSTALLING_FROM_CONFIGURATION_FILE == "yes" ]]; then
|
|
711
|
+ if [ ! -f $CONFIGURATION_FILE ]; then
|
|
712
|
+ echo "The configuration file $CONFIGURATION_FILE was not found"
|
|
713
|
+ exit 8935
|
|
714
|
+ fi
|
|
715
|
+ fi
|
|
716
|
+
|
699
|
717
|
if [ -f $CONFIGURATION_FILE ]; then
|
700
|
718
|
if grep -q "SSL_PROTOCOLS" $CONFIGURATION_FILE; then
|
701
|
719
|
SSL_PROTOCOLS=$(grep "SSL_PROTOCOLS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|