|
 |
ab36df |
From 2f5770c038c9fdb158b456ca105276968d84514e Mon Sep 17 00:00:00 2001
|
|
|
ab36df |
From: Dominic Cleal <dcleal@redhat.com>
|
|
|
ab36df |
Date: Wed, 9 Jul 2014 09:45:19 +0100
|
|
|
ab36df |
Subject: [PATCH] Systemd: parse /etc/sysconfig/*.systemd as used in 389-ds
|
|
|
ab36df |
|
|
|
ab36df |
Fixes RHBZ#1083022
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit 9073aa57a7003bad3f8b9886675f155e5b374892)
|
|
|
ab36df |
|
|
|
ab36df |
Conflicts:
|
|
|
ab36df |
NEWS
|
|
|
ab36df |
---
|
|
|
ab36df |
lenses/shellvars.aug | 3 ++-
|
|
|
ab36df |
lenses/systemd.aug | 1 +
|
|
|
ab36df |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
ab36df |
|
|
|
ab36df |
diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
|
|
|
ab36df |
index eff933a..784ce6e 100644
|
|
|
ab36df |
--- a/lenses/shellvars.aug
|
|
|
ab36df |
+++ b/lenses/shellvars.aug
|
|
|
ab36df |
@@ -212,7 +212,8 @@ module Shellvars =
|
|
|
ab36df |
sc_excl "SuSEfirewall2.d" .
|
|
|
ab36df |
sc_incl "SuSEfirewall2.d/cobbler" .
|
|
|
ab36df |
sc_incl "SuSEfirewall2.d/services/*" .
|
|
|
ab36df |
- sc_excl "SuSEfirewall2.d/services/TEMPLATE"
|
|
|
ab36df |
+ sc_excl "SuSEfirewall2.d/services/TEMPLATE" .
|
|
|
ab36df |
+ sc_excl "*.systemd"
|
|
|
ab36df |
|
|
|
ab36df |
let filter_default = incl "/etc/default/*"
|
|
|
ab36df |
. excl "/etc/default/grub_installdevice*"
|
|
|
ab36df |
diff --git a/lenses/systemd.aug b/lenses/systemd.aug
|
|
|
ab36df |
index aba1001..c7f9f9d 100644
|
|
|
ab36df |
--- a/lenses/systemd.aug
|
|
|
ab36df |
+++ b/lenses/systemd.aug
|
|
|
ab36df |
@@ -159,6 +159,7 @@ let filter = incl "/lib/systemd/system/*"
|
|
|
ab36df |
. incl "/lib/systemd/system/*/*"
|
|
|
ab36df |
. incl "/etc/systemd/system/*"
|
|
|
ab36df |
. incl "/etc/systemd/system/*/*"
|
|
|
ab36df |
+ . incl "/etc/sysconfig/*.systemd"
|
|
|
ab36df |
. Util.stdexcl
|
|
|
ab36df |
|
|
|
ab36df |
let xfm = transform lns filter
|