summaryrefslogtreecommitdiffstats
path: root/core/rootfs
diff options
context:
space:
mode:
authorSimon Rettberg2018-05-03 16:08:50 +0200
committerSimon Rettberg2018-05-03 16:08:50 +0200
commitf9a649113e1bfd59d7294ccb1bef78e574f9659a (patch)
tree9923bf3b316000329ff6f7dea95707679eeb1a15 /core/rootfs
parent[rfs-stage31] Bring br0 up even if we don't have an IP yet (diff)
downloadmltk-f9a649113e1bfd59d7294ccb1bef78e574f9659a.tar.gz
mltk-f9a649113e1bfd59d7294ccb1bef78e574f9659a.tar.xz
mltk-f9a649113e1bfd59d7294ccb1bef78e574f9659a.zip
[rfs-stage31] Don't try to source config before downloading it...
Diffstat (limited to 'core/rootfs')
-rw-r--r--core/rootfs/rootfs-stage31/data/inc/functions6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/rootfs/rootfs-stage31/data/inc/functions b/core/rootfs/rootfs-stage31/data/inc/functions
index baf31afc..6edbeffb 100644
--- a/core/rootfs/rootfs-stage31/data/inc/functions
+++ b/core/rootfs/rootfs-stage31/data/inc/functions
@@ -48,7 +48,11 @@ download() {
[ $# -ne 2 ] && echo "Error - 'download' requires 2 arguments, $# given." && return 1
if [ -z "$SLX_KCL_SERVERS" ]; then
- . "/opt/openslx/config" || echo "Error - could not source '/opt/openslx/config'"
+ if ! [ -s "/opt/openslx/config" ]; then
+ echo "Don't have any servers to download from."
+ elif ! . "/opt/openslx/config"; then
+ echo "Error - could not source '/opt/openslx/config'"
+ fi
fi
local FILE_URL="$1"