diff options
| author | Christian Rößler | 2014-02-18 18:15:03 +0100 |
|---|---|---|
| committer | Christian Rößler | 2014-02-18 18:15:03 +0100 |
| commit | 84c428a5ea2b8ae6b81a87016d4f4279088d0c0a (patch) | |
| tree | ebb5b6430ed6461e604f0be3c4ebbcb947548325 | |
| parent | nvidia driver extraction: First working script, perhaps useful for someone. U... (diff) | |
| parent | Better prevent this from happening :) (diff) | |
| download | tm-scripts-84c428a5ea2b8ae6b81a87016d4f4279088d0c0a.tar.gz tm-scripts-84c428a5ea2b8ae6b81a87016d4f4279088d0c0a.tar.xz tm-scripts-84c428a5ea2b8ae6b81a87016d4f4279088d0c0a.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | mltk | 2 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.build | 3 |
3 files changed, 5 insertions, 1 deletions
@@ -11,3 +11,4 @@ list* test logs/ server/local_builds/ +/config @@ -49,6 +49,8 @@ for HELPER in "$ROOT_DIR"/remote/includes/*.inc; do qnd_exit done +# Support sourcing a "config" where you can set up stuff like 'export http_proxy=...' +[ -e "$ROOT_DIR/config" ] && . "$ROOT_DIR/config" banner () { echo -e "\033[38;5;202m\t __ __ __ " diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index a751b8f4..bd6d3106 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -123,7 +123,8 @@ post_copy() { if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then local DIST=$(lsb_release -si) if [ -n "$DIST" ]; then - wget -O "$TARGET_BUILD_DIR/etc/distro.png" "http://132.230.8.113/distro_logo.php?distro=$DIST" + [ -z "$CFG_DISTLOGO_URL" ] && CFG_DISTLOGO_URL='http://mltk-services.ruf.uni-freiburg.de/distro_logo.php?distro=' + wget -O "$TARGET_BUILD_DIR/etc/distro.png" "${CFG_DISTLOGO_URL}${DIST}" if [ ! -s "$TARGET_BUILD_DIR/etc/distro.png" ]; then rm -f "$TARGET_BUILD_DIR/etc/distro.png" pwarning "Could not download distro-logo" |