From b87e912005f2bf986601f600d25fdd28d88c76e0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 17 Jan 2014 18:40:40 +0100
Subject: [cron] Place our own cron in /opt/openslx/...

---
 remote/modules/cron/cron.build                           | 4 ++--
 remote/modules/cron/data/etc/systemd/system/cron.service | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'remote/modules/cron')

diff --git a/remote/modules/cron/cron.build b/remote/modules/cron/cron.build
index fc364347..932c3e85 100644
--- a/remote/modules/cron/cron.build
+++ b/remote/modules/cron/cron.build
@@ -18,8 +18,8 @@ build() {
 	make cron || perror "Could not compile cron using 'make'."
 
 	# copy to build dir, since there are no shared libs linked in
-	mkdir -p "${MODULE_BUILD_DIR}/usr/sbin"
-	cp "$MODULE_DIR/src/cron" "$MODULE_BUILD_DIR/usr/sbin/" || perror "Could copy cron binary to ${MODULE_BUILD_DIR}"
+	mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/sbin"
+	cp "${MODULE_DIR}/src/cron" "${MODULE_BUILD_DIR}/opt/openslx/sbin/" || perror "Could copy cron binary to ${MODULE_BUILD_DIR}"
 
 	cd - &>/dev/null
 }
diff --git a/remote/modules/cron/data/etc/systemd/system/cron.service b/remote/modules/cron/data/etc/systemd/system/cron.service
index 2c5b832a..fbf17b27 100644
--- a/remote/modules/cron/data/etc/systemd/system/cron.service
+++ b/remote/modules/cron/data/etc/systemd/system/cron.service
@@ -1,7 +1,7 @@
 [Unit]
-Description=CRON
+Description=Cron Daemon
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/cron
+ExecStart=/opt/openslx/sbin/cron
 ExecStop=/opt/openslx/bin/kill -TERM $MAINPID
-- 
cgit v1.2.3-55-g7522