Changeset 2561


Ignore:
Timestamp:
Aug 8, 2014, 10:02:15 PM (8 years ago)
Author:
andersk
Message:
Revert "Fix remote-fs.target ordering; block OpenAFS on network-online.target"

Wrong branch.
Location:
trunk/server
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.service

    r2560 r2561  
    22Description=Scripts AFS Configuration Service
    33After=syslog.target openafs-client.service
    4 Before=remote-fs.target
     4Before=crond.service
    55Requires=openafs-client.service
    66
     
    1010
    1111[Install]
    12 WantedBy=multi-user.target remote-fs.target
     12WantedBy=multi-user.target remote-fs.target crond.service
  • trunk/server/common/oursrc/tokensys/scripts-afsagent.service

    r2560 r2561  
    22Description=Scripts afsagent Service
    33After=syslog.target openafs-client.service
    4 Before=remote-fs.target
     4Before=crond.service
    55Requires=openafs-client.service
    66
     
    1111
    1212[Install]
    13 WantedBy=multi-user.target remote-fs.target
     13WantedBy=multi-user.target remote-fs.target crond.service
  • trunk/server/common/patches/openafs-systemd-crond.patch

    r2560 r2561  
    11diff --git a/src/packaging/RedHat/openafs-client.service b/src/packaging/RedHat/openafs-client.service
    2 index 936762e..c0558b2 100644
     2index bc95057..9627280 100644
    33--- a/src/packaging/RedHat/openafs-client.service
    44+++ b/src/packaging/RedHat/openafs-client.service
    5 @@ -1,6 +1,7 @@
     5@@ -1,5 +1,6 @@
    66 [Unit]
    77 Description=OpenAFS Client Service
    8 -After=syslog.target network.target
    9 +After=syslog.target network-online.target
    10 +Before=remote-fs.target
     8+Before=crond.service
     9 After=syslog.target network.target
    1110 
    1211 [Service]
    13  Type=forking
     12@@ -15,4 +16,4 @@ ExecStop=/sbin/rmmod openafs
     13 KillMode=none
     14 
     15 [Install]
     16-WantedBy=multi-user.target remote-fs.target
     17+WantedBy=multi-user.target remote-fs.target crond.service
  • trunk/server/fedora/specs/zhm.init

    r2560 r2561  
    1414### BEGIN INIT INFO
    1515# Provides: zhm
    16 # Required-Start: $local_fs $network $named
    17 # Required-Stop: $local_fs $network
     16# Required-Start: $local_fs $remote_fs $network $named
     17# Required-Stop: $local_fs $remote_fs $network
    1818# Default-Start: 2 3 4 5
    1919# Default-Stop: 0 1 6
Note: See TracChangeset for help on using the changeset viewer.