X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fpkg%2Ffcron;h=745420b2e94f30aca34dcb926756ffb003fb7791;hb=0a9c704223ed6e41b95af7f397a3edf4fd21eab2;hp=517298a616b1b837850d46a4308d9923204c80e6;hpb=3dae4c554ec18f465eb6ee5e6efdbdbe8557e13c;p=hvlinux.git

diff --git a/stage3/pkg/fcron b/stage3/pkg/fcron
index 517298a..745420b 100644
--- a/stage3/pkg/fcron
+++ b/stage3/pkg/fcron
@@ -57,21 +57,23 @@ editor     = /usr/bin/nano
 EOF
     chmod 640 /etc/fcron/fcron.conf
 
-    cat > /etc/fcron/fcrontab << "EOF"
-# &options min hrs day-of-month month day-of-week command
-# Run rotatelogs every day at 00:05
-#&mail(false) 05 00 * * * /usr/local/bin/rotatelogs
-EOF
-    chmod 640 /etc/fcron/fcrontab
-    chown -R root.fcron /etc/fcron
-
-    install -d /var/spool/fcron
+    install -v -d /var/spool/fcron
     chown fcron.fcron /var/spool/fcron
 
     cat > /etc/fcron/configure << "EOF"
-#!/bin/sh
+#!/bin/bash
+
+# Create empty file (or erase existing file)
+> /etc/fcron/fcron.tab
 
-fcrontab -c /etc/fcron/fcron.conf /etc/fcron/fcrontab
+for f in /etc/fcron/fcron.d/*; do
+    cat $f >> /etc/fcron/fcron.tab
+done
+
+chown -R root:fcron /etc/fcron
+chmod 640 /etc/fcron/fcron.tab
+
+fcrontab -c /etc/fcron/fcron.conf /etc/fcron/fcron.tab
 
 exit $?
 EOF
@@ -84,4 +86,6 @@ EOF
 
     # script-name start stop
     bootscript_add_rcsysinit fcron 95 84
+
+    install -v -m644 ${SCRDIR}/misc/fcron.d/* /etc/fcron/fcron.d
 }