summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2002-04-02 06:14:09 +0000
committerJonas Smedegaard <dr@jones.dk>2002-04-02 06:14:09 +0000
commit82d7395a2f49b6ef37c5ad7458e69c5fd6bafdc3 (patch)
tree2024a3b0dcb00cb729fdb5022253a01570cd647d
parenta1808c1cb06bc0521e44eb6f7a92dc5723bfdc8b (diff)
harden: Simplify integrit a bit, and make sure additions are made even if the above fails (grrr).
-rw-r--r--cfengine/cf.services.harden20
1 files changed, 5 insertions, 15 deletions
diff --git a/cfengine/cf.services.harden b/cfengine/cf.services.harden
index ae315b9..21f8bf1 100644
--- a/cfengine/cf.services.harden
+++ b/cfengine/cf.services.harden
@@ -119,21 +119,11 @@ editfiles:
LocateLineMatching "^#[[:blank:]]*!/usr/src"
ReplaceLineWith "!/usr/src"
ResetSearch "1"
- BeginGroupIfNoLineMatching "^!/initrc"
- Append "!/initrc"
- EndGroup
- ResetSearch "1"
- BeginGroupIfNoLineMatching "^!/.journal"
- Append "!/.journal"
- EndGroup
- ResetSearch "1"
- BeginGroupIfNoLineMatching "^!/usr/local"
- Append "!/usr/local"
- EndGroup
- ResetSearch "1"
- BeginGroupIfNoLineMatching "^!/usr/src"
- Append "!/usr/src"
- EndGroup
+ CatchAbort
+ AppendIfNoLineMatching "!/initrc"
+ AppendIfNoLineMatching "!/.journal"
+ AppendIfNoLineMatching "!/usr/local"
+ AppendIfNoLineMatching "!/usr/src"
}
# { /etc/cron.daily/integrit
# #