diff options
| author | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2016-12-23 13:12:09 +0100 |
| commit | 6806ae4a850fc7785a8c05304237cf53b5b8f951 (patch) | |
| tree | b1dd8413d6c7b9a250251da7f0d49bb52b4ddc57 /core/modules/cron | |
| parent | wrong kernel version variable used (diff) | |
| download | mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.gz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.tar.xz mltk-6806ae4a850fc7785a8c05304237cf53b5b8f951.zip | |
merge with latest dev version (tm-scripts commit f5a59daf8d70a9027118292cd40b18c221897408)
Diffstat (limited to 'core/modules/cron')
| -rwxr-xr-x | core/modules/cron/data/opt/openslx/scripts/cron-sendmail | 8 | ||||
| -rw-r--r-- | core/modules/cron/module.build | 9 | ||||
| -rw-r--r-- | core/modules/cron/module.conf | 2 |
3 files changed, 6 insertions, 13 deletions
diff --git a/core/modules/cron/data/opt/openslx/scripts/cron-sendmail b/core/modules/cron/data/opt/openslx/scripts/cron-sendmail index 3ce2a19d..f46c226d 100755 --- a/core/modules/cron/data/opt/openslx/scripts/cron-sendmail +++ b/core/modules/cron/data/opt/openslx/scripts/cron-sendmail @@ -10,16 +10,14 @@ if [ "x$SLX_CRON_MAIL" = "xslxlog" ]; then SUBJ=$(grep '^Subject: .*$' "$TMP" | cut -c 10-) if [ -n "$SUBJ" ]; then - slxlog "cron" "$SUBJ" "$TMP" + slxlog --delete "cron" "$SUBJ" "$TMP" fi - - rm -f -- "$TMP" elif [ -n "$SLX_CRON_MAIL" ] && [ -x "$SLX_CRON_MAIL" ]; then # see if SLX_CRON_MAIL is a valid binary and use that - $SLX_CRON_MAIL $@ + $SLX_CRON_MAIL "$@" elif which sendmail 2> /dev/null; then # fallback to sendmail - sendmail $@ + sendmail "$@" elif which logger 2> /dev/null; then # nothing worked, write to syslog if logger is present TMP=$(mktemp /tmp/cron.XXXXXXXX) diff --git a/core/modules/cron/module.build b/core/modules/cron/module.build index a80caf57..1f31ac21 100644 --- a/core/modules/cron/module.build +++ b/core/modules/cron/module.build @@ -1,17 +1,13 @@ -#!/bin/bash - - fetch_source() { [ -d "${MODULE_WORK_DIR}/src/.git" ] && return 0 rm -rf -- "${MODULE_WORK_DIR}/src" - git clone --depth 1 "${REQUIRED_GIT}" "${MODULE_WORK_DIR}/src" || perror "Could not create ${MODULE_WORK_DIR}/src" + git clone "${REQUIRED_GIT}" "${MODULE_WORK_DIR}/src" || perror "Could not clone git to ${MODULE_WORK_DIR}/src" cd "${MODULE_WORK_DIR}/src" git checkout "${REQUIRED_COMMIT}" || perror "Could not switch to required commit" - cd - + cd - &>/dev/null } build() { - # compilation cd "${MODULE_WORK_DIR}/src" || perror "Could not cd to '${MODULE_WORK_DIR}/src'. Did fetch_source work?" ./autogen.sh || perror "Autogen failed" @@ -22,7 +18,6 @@ build() { # NO MAKE INSTALL: Copy to build dir, since there are no shared libs linked in mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/sbin" cp "${MODULE_WORK_DIR}/src/src/crond" "${MODULE_BUILD_DIR}/opt/openslx/sbin/" || perror "Could not copy crond binary to ${MODULE_BUILD_DIR}" - cd - &>/dev/null } diff --git a/core/modules/cron/module.conf b/core/modules/cron/module.conf index 60d5555d..6f07729f 100644 --- a/core/modules/cron/module.conf +++ b/core/modules/cron/module.conf @@ -1,5 +1,5 @@ REQUIRED_GIT="http://git.fedorahosted.org/git/cronie.git" -REQUIRED_COMMIT="bab45f0b817d8829f2423e033d90974c9a3abc20" +REQUIRED_COMMIT="c219d7cb9d4887f685ac4ff1e9439b0d8aa39ef6" REQUIRED_BINARIES=" crond " |