diff options
| author | Jonathan Bauer | 2013-08-01 18:13:17 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-08-01 18:13:17 +0200 |
| commit | 9cb3c92b2d12061936ab813e11ff95eb3c9311fb (patch) | |
| tree | 18d991d7c94f76d7101b32f95764bd74bd8edc26 /server/export_target | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-9cb3c92b2d12061936ab813e11ff95eb3c9311fb.tar.gz tm-scripts-9cb3c92b2d12061936ab813e11ff95eb3c9311fb.tar.xz tm-scripts-9cb3c92b2d12061936ab813e11ff95eb3c9311fb.zip | |
[server/export_target] move the check for the validity of the given config in generate_config and not in initial_checks
Diffstat (limited to 'server/export_target')
| -rwxr-xr-x | server/export_target | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/export_target b/server/export_target index 3bda2ce6..37a74b55 100755 --- a/server/export_target +++ b/server/export_target @@ -35,10 +35,6 @@ initial_checks() { [ -d "${SERVER_BOOT_DIR}" ] || mkdir -p "${SERVER_BOOT_DIR}" - # check if SERVER_EXPORT_TARGET is valid - [ ! -z "${SERVER_EXPORT_CONFIG}" ] || perror "Server export config not given!" - [ -d "${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}" ] || \ - perror "Given export config not found: ${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}" } copy_kernel() { @@ -90,6 +86,11 @@ generate_config() { local TOOL_STR="${TOOL_STR} generate_config:" pinfo "Generating config.tgz for '${SERVER_CONFIG_TYPE}'" + # check if SERVER_EXPORT_TARGET is valid + [ ! -z "${SERVER_EXPORT_CONFIG}" ] || perror "Server export config not given!" + [ -d "${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}" ] || \ + perror "Given export config not found: ${SERVER_CONFIGS_DIR}/${SERVER_EXPORT_CONFIG}" + # directory where the activated modules are given # ex: server/configs/freiburg/ local TARGET_CONFIG_DIR="${SERVER_CONFIGS_DIR}/${SERVER_CONFIG_TYPE}" |