aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-05-25 17:41:48 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-05-25 17:41:48 +0000
commit5e341d0d0d9235a1c5d9065d7e6f12fde2378b10 (patch)
treee2b49274309d6831c51acb9ecdad8b6a89ebd11c /package/utils/busybox
parent3ab83a078fb9f68ac3b9e7f7a9f2ebe6faa91ae1 (diff)
downloadupstream-5e341d0d0d9235a1c5d9065d7e6f12fde2378b10.tar.gz
upstream-5e341d0d0d9235a1c5d9065d7e6f12fde2378b10.tar.bz2
upstream-5e341d0d0d9235a1c5d9065d7e6f12fde2378b10.zip
busybox: use a config option instead of a patch to select the cron directory
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40847
Diffstat (limited to 'package/utils/busybox')
-rw-r--r--package/utils/busybox/Config-defaults.in2
-rw-r--r--package/utils/busybox/patches/200-etc_crontabs.patch22
2 files changed, 1 insertions, 23 deletions
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index c12cf2ad16..aad6086d4b 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -1656,7 +1656,7 @@ config BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
default n
config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
string
- default "/var/spool/cron"
+ default "/etc"
config BUSYBOX_DEFAULT_CRONTAB
bool
default y
diff --git a/package/utils/busybox/patches/200-etc_crontabs.patch b/package/utils/busybox/patches/200-etc_crontabs.patch
deleted file mode 100644
index ebf2990502..0000000000
--- a/package/utils/busybox/patches/200-etc_crontabs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/miscutils/crond.c
-+++ b/miscutils/crond.c
-@@ -37,7 +37,7 @@
-
-
- #define TMPDIR CONFIG_FEATURE_CROND_DIR
--#define CRONTABS CONFIG_FEATURE_CROND_DIR "/crontabs"
-+#define CRONTABS "/etc/crontabs"
- #ifndef SENDMAIL
- # define SENDMAIL "sendmail"
- #endif
---- a/miscutils/crontab.c
-+++ b/miscutils/crontab.c
-@@ -22,7 +22,7 @@
-
- #include "libbb.h"
-
--#define CRONTABS CONFIG_FEATURE_CROND_DIR "/crontabs"
-+#define CRONTABS "/etc/crontabs"
- #ifndef CRONUPDATE
- #define CRONUPDATE "cron.update"
- #endif