forked from obel1x/fedora-OEMDRV
confige: source dists defaults to for robustnes
and docs
This commit is contained in:
@@ -82,7 +82,7 @@ do_configure() {
|
||||
echo "Invalid choice or error in selection made."
|
||||
done
|
||||
else
|
||||
cp "${CONF_DIST}" "$CONF_FILE"
|
||||
cp "${CONF_DIST}" "$CONF_PRE"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
@@ -101,6 +101,11 @@ do_configure() {
|
||||
set_conf_var "REPO_BRANCH" "$REPO_BRANCH"
|
||||
fi
|
||||
|
||||
# Now there should all starting values be defined in $CONF_PRE file.
|
||||
# We will additionally first read the dists defaults again to make sure, that all relevant settings that may be new to existing configs are predefined
|
||||
# Could be no good idea when sysadmins are only deleting lines instead of unsettings its value, but makes sure there is not missing something for setup
|
||||
source "$CONF_DIST"
|
||||
#Now, read the users setting
|
||||
source "$CONF_PRE"
|
||||
VARS=("TLDOMAIN" "SERVERFQDN_IPA" "DOMAIN" "SERVERFQDN_NC" "IPAVAULTUSE" "IPAVAULTNAME" "DISTCONFIGPATH_SRC" "CLIENTADMINGROUP" )
|
||||
for ELE in "${VARS[@]}"
|
||||
@@ -173,7 +178,8 @@ do_configure() {
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
*) REPEAT_TEST=0
|
||||
*) echo "Not tests available."
|
||||
REPEAT_TEST=0
|
||||
;;
|
||||
esac
|
||||
[[ $REPEAT_TEST == 0 ]] && break
|
||||
|
||||
Reference in New Issue
Block a user