summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
authorLars Müller2007-01-29 18:33:24 +0100
committerLars Müller2007-01-29 18:33:24 +0100
commit5ec03ba04c1f354c57660080b767ae0dac2afb4f (patch)
tree3be6033fd154db80bd815b03c9ef3241b17607a3 /installer
parentAdd a todo regarding the architecture. I'm not sure yet if there is a (diff)
downloadcore-5ec03ba04c1f354c57660080b767ae0dac2afb4f.tar.gz
core-5ec03ba04c1f354c57660080b767ae0dac2afb4f.tar.xz
core-5ec03ba04c1f354c57660080b767ae0dac2afb4f.zip
Return an error if a givenb system name isn't found.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@646 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
-rwxr-xr-xinstaller/slxossetup14
1 files changed, 8 insertions, 6 deletions
diff --git a/installer/slxossetup b/installer/slxossetup
index 7b2c88bb..91fb09ce 100755
--- a/installer/slxossetup
+++ b/installer/slxossetup
@@ -19,6 +19,12 @@ test "$2" && \
PATH="/sbin:/bin:/usr/bin:/usr/sbin"
+function ErrorMsg()
+{
+ echo "$0: $2"
+ exit $1
+}
+
if test -z "${SLX_SYSTEM_BASENAME}"; then
echo "$0: Error, <system-name> not provided! "
exit 1
@@ -30,6 +36,8 @@ for dir in . ${SLX_CONFIG_PATH}; do
break
fi
done
+test -z "${SLX_SYSTEM_CONFIG_PATH}" && \
+ ErrorMsg 1 "Error, system named ${SLX_SYSTEM_BASENAME} not found in systems sub directory of . nor ${SLX_CONFIG_PATH} "
for dir in ${SLX_CONFIG_PATH} .; do
for file in settings.default settings.local; do
@@ -47,12 +55,6 @@ for suffix in "" local; do
. "${SLX_SYSTEM_CONFIG_PATH}/settings${suffix:+.$suffix}"
done
-function ErrorMsg()
-{
- echo "$0: $2"
- exit $1
-}
-
function setup_busybox_init()
{
for dir in ${SLX_STAGE1_PATH}; do