diff options
| author | Simon Rettberg | 2013-11-27 17:37:28 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-27 17:37:28 +0100 |
| commit | 09d933341e5d2d1728025c2fdfd5c22287e2c593 (patch) | |
| tree | aab52329b75959077d6cae667fbbcc416e2366dd | |
| parent | [vmchooser] Add slxlog to run-virt (diff) | |
| parent | [rootfs-stage32] slx addon download failure to slxlog (diff) | |
| download | tm-scripts-09d933341e5d2d1728025c2fdfd5c22287e2c593.tar.gz tm-scripts-09d933341e5d2d1728025c2fdfd5c22287e2c593.tar.xz tm-scripts-09d933341e5d2d1728025c2fdfd5c22287e2c593.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time | 4 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time index c0b97425..4a36d783 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_network_time @@ -16,9 +16,9 @@ for SERVER in $SLX_NTP_SERVER; do fi exit 0 fi - echo "Error querying $SERVER for current time" + echo "Error querying $SERVER for current time." done -echo "No more servers to try. No NTP server was reachable." >&2 +slxlog "ntpdate" "No NTP server was reachable. Date was not set." >&2 exit 1 diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons index 06460506..633736f1 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons @@ -61,7 +61,7 @@ if [ $# -eq 1 ]; then # download the addon from the given URL ADDON_TARGET_PATH="${SYS_TMP}/$(basename "$ADDON").sqfs" if ! download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then - echo "Download of ${ADDON} failed." + slxlog "addon-setup" "Download of ${ADDON} failed." exit 1 fi |