diff options
| author | Simon Rettberg | 2013-11-27 18:07:03 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-27 18:07:03 +0100 |
| commit | bbbad2f5daa9a5e5739821c74360e897246d1e64 (patch) | |
| tree | 85145a06d755bc2e46922a42ce52299a68904a01 /remote/rootfs | |
| parent | [vmware] bump version to 10.0.1 (diff) | |
| parent | [rfs-stage32] Make our busybox ash the default /bin/sh (diff) | |
| download | tm-scripts-bbbad2f5daa9a5e5739821c74360e897246d1e64.tar.gz tm-scripts-bbbad2f5daa9a5e5739821c74360e897246d1e64.tar.xz tm-scripts-bbbad2f5daa9a5e5739821c74360e897246d1e64.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/rootfs')
4 files changed, 4 insertions, 6 deletions
diff --git a/remote/rootfs/rootfs-stage32/data/bin/sh b/remote/rootfs/rootfs-stage32/data/bin/sh new file mode 120000 index 00000000..f8c409b1 --- /dev/null +++ b/remote/rootfs/rootfs-stage32/data/bin/sh @@ -0,0 +1 @@ +/opt/openslx/bin/ash
\ No newline at end of file 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 diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 1b1b190b..cdb73342 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -93,9 +93,6 @@ post_copy() { # link /etc/mtab, needed for systemd [ ! -e "${TARGET_BUILD_DIR}/etc/mtab" ] && ln -s "/proc/self/mounts" "${TARGET_BUILD_DIR}/etc/mtab" - # need a /bin/sh - [ ! -e "$TARGET_BUILD_DIR/bin/sh" ] && ln -s "bash" "$TARGET_BUILD_DIR/bin/sh" - # passwd, group, shadow init_users_and_groups |