diff options
| author | Simon Rettberg | 2016-01-12 16:04:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-01-12 16:04:38 +0100 |
| commit | b24c0a49eb4c29b9b9345c273efe40c525290cdf (patch) | |
| tree | 381c87c06e805ba6547cba03fb1ffa9d7009bfad | |
| parent | [rfs-stage31/32] Sync time in stage31 to prevent clock jumping later on (diff) | |
| download | tm-scripts-b24c0a49eb4c29b9b9345c273efe40c525290cdf.tar.gz tm-scripts-b24c0a49eb4c29b9b9345c273efe40c525290cdf.tar.xz tm-scripts-b24c0a49eb4c29b9b9345c273efe40c525290cdf.zip | |
[rfs-stage31] Add drop_shells to activate_sysconfig
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig index e245371f..9837f150 100644 --- a/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/remote/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -24,9 +24,9 @@ fetch_sysconfig() { # This function downloads the config.tgz and unpacks it to $TARGET_PATH <-- no it doesn't! # fetch_config_files() { - [ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && exit 0 + [ -e "${CONFIG}.tgz" ] && echo "config.tgz already downloaded." && return 0 - download "${SLX_BASE_PATH}/config.tgz" "${CONFIG}.tgz" || return 1 + download "${SLX_BASE_PATH}/config.tgz" "${CONFIG}.tgz" } @@ -81,6 +81,7 @@ HEREEND [ $DEBUG -eq 0 ] && rm -f -- "${CONFIG}.tgz" # Display branding logo if splash screen is shown [ "x${MUTED_OUTPUT}" = "x1" ] && [ -e "${FUTURE_ROOT}/etc/branding.ppm" ] && fbsplash -s "${FUTURE_ROOT}/etc/branding.ppm" & + return 0 } @@ -89,9 +90,9 @@ HEREEND # MAIN PART # -fetch_sysconfig -. "${CONFIG}-remote" -fetch_config_files -update_sysconfig +fetch_sysconfig || drop_shell "Could not download remote config" +. "${CONFIG}-remote" || drop_shell "Could not source remote config" +fetch_config_files || drop_shell "Could not download config.tgz" +update_sysconfig || drop_shell "Could not update sysconfig" true |