Index: trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.service
===================================================================
--- trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.service	(revision 2558)
+++ trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.service	(revision 2560)
@@ -2,5 +2,5 @@
 Description=Scripts AFS Configuration Service
 After=syslog.target openafs-client.service
-Before=crond.service
+Before=remote-fs.target
 Requires=openafs-client.service
 
@@ -10,3 +10,3 @@
 
 [Install]
-WantedBy=multi-user.target remote-fs.target crond.service
+WantedBy=multi-user.target remote-fs.target
Index: trunk/server/common/oursrc/tokensys/scripts-afsagent.service
===================================================================
--- trunk/server/common/oursrc/tokensys/scripts-afsagent.service	(revision 2558)
+++ trunk/server/common/oursrc/tokensys/scripts-afsagent.service	(revision 2560)
@@ -2,5 +2,5 @@
 Description=Scripts afsagent Service
 After=syslog.target openafs-client.service
-Before=crond.service
+Before=remote-fs.target
 Requires=openafs-client.service
 
@@ -11,3 +11,3 @@
 
 [Install]
-WantedBy=multi-user.target remote-fs.target crond.service
+WantedBy=multi-user.target remote-fs.target
Index: trunk/server/common/patches/openafs-systemd-crond.patch
===================================================================
--- trunk/server/common/patches/openafs-systemd-crond.patch	(revision 2558)
+++ trunk/server/common/patches/openafs-systemd-crond.patch	(revision 2560)
@@ -1,17 +1,13 @@
 diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
-index bc95057..9627280 100644
+index 936762e..c0558b2 100644
 --- a/src/packaging/RedHat/openafs-client.service
 +++ b/src/packaging/RedHat/openafs-client.service
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
  [Unit]
  Description=OpenAFS Client Service
-+Before=crond.service
- After=syslog.target network.target
+-After=syslog.target network.target
++After=syslog.target network-online.target
++Before=remote-fs.target
  
  [Service]
-@@ -15,4 +16,4 @@ ExecStop=/sbin/rmmod openafs
- KillMode=none
- 
- [Install]
--WantedBy=multi-user.target remote-fs.target
-+WantedBy=multi-user.target remote-fs.target crond.service
+ Type=forking
Index: trunk/server/fedora/specs/zhm.init
===================================================================
--- trunk/server/fedora/specs/zhm.init	(revision 2558)
+++ trunk/server/fedora/specs/zhm.init	(revision 2560)
@@ -14,6 +14,6 @@
 ### BEGIN INIT INFO
 # Provides: zhm
-# Required-Start: $local_fs $remote_fs $network $named
-# Required-Stop: $local_fs $remote_fs $network
+# Required-Start: $local_fs $network $named
+# Required-Stop: $local_fs $network
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6