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