diff options
| author | Jonathan Bauer | 2014-04-14 15:33:26 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2014-04-14 15:33:26 +0200 |
| commit | 82401448e2d43c48a7187f2df3577b0f7a545519 (patch) | |
| tree | 41b25d441ea1f89bc2e06b5f0dedac84c47c715e /remote/modules | |
| parent | [systemd] apply openslx patch only in systemd<212 (diff) | |
| parent | [systemd] git REQUIRED_URL and REQUIRED_KMOD_URL added to U14.04-conf (diff) | |
| download | tm-scripts-82401448e2d43c48a7187f2df3577b0f7a545519.tar.gz tm-scripts-82401448e2d43c48a7187f2df3577b0f7a545519.tar.xz tm-scripts-82401448e2d43c48a7187f2df3577b0f7a545519.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/systemd/module.conf.ubuntu.14 | 5 | ||||
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/remote/modules/systemd/module.conf.ubuntu.14 b/remote/modules/systemd/module.conf.ubuntu.14 index 1724d26f..af404a7f 100644 --- a/remote/modules/systemd/module.conf.ubuntu.14 +++ b/remote/modules/systemd/module.conf.ubuntu.14 @@ -1,5 +1,8 @@ REQUIRED_VERSION="systemd-212" -REQUIRED_LIBKMOD_VERSION="kmod-15" +REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz" +REQUIRED_LIBKMOD_VERSION="kmod-17" +REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.xz" + REQUIRED_INSTALLED_PACKAGES=" intltool gperf diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index ec9f906e..c4ae4617 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -51,7 +51,7 @@ cleanexit () { sleep 1 # remove config dirs when exit if echo "${RMDIRS}" 2>/dev/null | grep -q "${xmlvirt}"; then - writelog "${xmlvirt} exited. Cleanning up... \c" + writelog "${xmlvirt} exited. Cleaning up... \c" rm -rf -- ${RMDIRS} >/dev/null 2>&1 writelog "done" fi |