diff options
-rwxr-xr-x | meta/recipes-extended/cronie/cronie/crond.init | 2 | ||||
-rw-r--r-- | meta/recipes-extended/cronie/cronie_1.4.8.bb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-extended/cronie/cronie/crond.init b/meta/recipes-extended/cronie/cronie/crond.init index 050c37e453..08f34beed9 100755 --- a/meta/recipes-extended/cronie/cronie/crond.init +++ b/meta/recipes-extended/cronie/cronie/crond.init | |||
@@ -21,8 +21,6 @@ CONFIG=/etc/sysconfig/crond | |||
21 | # Source function library. | 21 | # Source function library. |
22 | . /etc/init.d/functions | 22 | . /etc/init.d/functions |
23 | 23 | ||
24 | UID=`id -u` | ||
25 | |||
26 | case "$1" in | 24 | case "$1" in |
27 | start) | 25 | start) |
28 | if [ $UID -ne 0 ] ; then | 26 | if [ $UID -ne 0 ] ; then |
diff --git a/meta/recipes-extended/cronie/cronie_1.4.8.bb b/meta/recipes-extended/cronie/cronie_1.4.8.bb index 4cfdfadf6f..064347e9d5 100644 --- a/meta/recipes-extended/cronie/cronie_1.4.8.bb +++ b/meta/recipes-extended/cronie/cronie_1.4.8.bb | |||
@@ -15,7 +15,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \ | |||
15 | SECTION = "utils" | 15 | SECTION = "utils" |
16 | 16 | ||
17 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 17 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
18 | PR = "r0" | 18 | RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)}" |
19 | PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" | ||
20 | |||
21 | PR = "r1" | ||
19 | 22 | ||
20 | SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ | 23 | SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \ |
21 | file://crond.init \ | 24 | file://crond.init \ |
@@ -31,7 +34,7 @@ SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785 | |||
31 | inherit autotools update-rc.d | 34 | inherit autotools update-rc.d |
32 | 35 | ||
33 | EXTRA_OECONF += "\ | 36 | EXTRA_OECONF += "\ |
34 | ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}" | 37 | ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" |
35 | 38 | ||
36 | INITSCRIPT_NAME = "crond" | 39 | INITSCRIPT_NAME = "crond" |
37 | INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." | 40 | INITSCRIPT_PARAMS = "start 90 2 3 4 5 . stop 60 0 1 6 ." |
@@ -50,6 +53,7 @@ do_install_append () { | |||
50 | mkdir -p ${D}${sysconfdir}/cron.daily | 53 | mkdir -p ${D}${sysconfdir}/cron.daily |
51 | mkdir -p ${D}${sysconfdir}/cron.weekly | 54 | mkdir -p ${D}${sysconfdir}/cron.weekly |
52 | mkdir -p ${D}${sysconfdir}/cron.monthly | 55 | mkdir -p ${D}${sysconfdir}/cron.monthly |
56 | touch ${D}${sysconfdir}/cron.deny | ||
53 | } | 57 | } |
54 | 58 | ||
55 | FILES_${PN} += "${sysconfdir}/cron*" | 59 | FILES_${PN} += "${sysconfdir}/cron*" |