saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tiny fix TEMP_CONFIG_DIR -> TEMP_KEYS_DIR in preseed function definition

Browse source
This commit is contained in:
Vladimir Kozhukalov 2013-06-27 12:18:25 +04:00
parent 7c36b9a240
commit 911fc03077
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bootstrap-salt.sh
View file

@ -2882,7 +2882,7 @@ for DEP_FUNC_NAME in $(__strip_duplicates $DEP_FUNC_NAMES); do
break
fi
done
echodebug "DEPS_INSTALL_FUNC=${DEPS_INSTALL_FUNC}"
# Let's get the minion config function
CONFIG_SALT_FUNC="null"
@ -2903,11 +2903,11 @@ if [ "$TEMP_CONFIG_DIR" != "null" ]; then
fi
done
fi
echodebug "CONFIG_SALT_FUNC=${CONFIG_SALT_FUNC}"
# Let's get the pre-seed master function
PRESEED_MASTER_FUNC="null"
if [ "$TEMP_CONFIG_DIR" != "null" ]; then
if [ "$TEMP_KEYS_DIR" != "null" ]; then
PRESEED_FUNC_NAMES="preseed_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_master"
PRESEED_FUNC_NAMES="$PRESEED_FUNC_NAMES preseed_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}${PREFIXED_DISTRO_MINOR_VERSION}_${ITYPE}_master"
@ -2924,7 +2924,7 @@ if [ "$TEMP_CONFIG_DIR" != "null" ]; then
fi
done
fi
echodebug "PRESEED_MASTER_FUNC=${PRESEED_MASTER_FUNC}"
# Let's get the install function
INSTALL_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}"
@ -2938,7 +2938,7 @@ for FUNC_NAME in $(__strip_duplicates $INSTALL_FUNC_NAMES); do
break
fi
done
echodebug "INSTALL_FUNC=${INSTALL_FUNC}"
# Let's get the post install function
POST_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_post"
@ -2956,7 +2956,7 @@ for FUNC_NAME in $(__strip_duplicates $POST_FUNC_NAMES); do
break
fi
done
echodebug "POST_INSTALL_FUNC=${POST_INSTALL_FUNC}"
# Let's get the start daemons install function
STARTDAEMONS_FUNC_NAMES="install_${DISTRO_NAME_L}${PREFIXED_DISTRO_MAJOR_VERSION}_${ITYPE}_restart_daemons"
@ -2973,7 +2973,7 @@ for FUNC_NAME in $(__strip_duplicates $STARTDAEMONS_FUNC_NAMES); do
break
fi
done
echodebug "STARTDAEMONS_INSTALL_FUNC=${STARTDAEMONS_INSTALL_FUNC}"
# Let's get the daemons running check function.
DAEMONS_RUNNING_FUNC="null"
@ -2991,7 +2991,7 @@ for FUNC_NAME in $(__strip_duplicates $DAEMONS_RUNNING_FUNC_NAMES); do
break
fi
done
echodebug "DAEMONS_RUNNING_FUNC=${DAEMONS_RUNNING_FUNC}"
if [ $DEPS_INSTALL_FUNC = "null" ]; then