|
 |
ab36df |
From d9ad7205af14dfb7620b9283ad363741695a8cc6 Mon Sep 17 00:00:00 2001
|
|
|
ab36df |
From: David Lutterkort <lutter@watzmann.net>
|
|
|
ab36df |
Date: Wed, 4 Dec 2013 12:02:57 -0800
|
|
|
ab36df |
Subject: [PATCH] Shellvars: exclude /etc/sysconfig/ip*tables.save files
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit 7830adc726d2da9f3d350aa3a74a7a865f57bd4f)
|
|
|
ab36df |
|
|
|
ab36df |
Shellvars: fix syntax error in filter
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit 69eb611785da41d540b75b37ca92fecd5406d67e)
|
|
|
ab36df |
|
|
|
ab36df |
Iptables: parse /etc/sysconfig/iptables.save
|
|
|
ab36df |
|
|
|
ab36df |
Fixes RHBZ#1144651
|
|
|
ab36df |
|
|
|
ab36df |
(cherry picked from commit 85904f7b819ac6a604873954138bbf647e98bfec)
|
|
|
ab36df |
|
|
|
ab36df |
Conflicts:
|
|
|
ab36df |
NEWS
|
|
|
ab36df |
---
|
|
|
ab36df |
lenses/iptables.aug | 1 +
|
|
|
ab36df |
lenses/shellvars.aug | 1 +
|
|
|
ab36df |
2 files changed, 2 insertions(+)
|
|
|
ab36df |
|
|
|
ab36df |
diff --git a/lenses/iptables.aug b/lenses/iptables.aug
|
|
|
ab36df |
index e0f9450..8ad2aef 100644
|
|
|
ab36df |
--- a/lenses/iptables.aug
|
|
|
ab36df |
+++ b/lenses/iptables.aug
|
|
|
ab36df |
@@ -83,4 +83,5 @@ let table = [ del /\*/ "*" . label "table" . store /[a-z]+/ . eol .
|
|
|
ab36df |
|
|
|
ab36df |
let lns = (comment|empty|table)*
|
|
|
ab36df |
let xfm = transform lns (incl "/etc/sysconfig/iptables"
|
|
|
ab36df |
+ . incl "/etc/sysconfig/iptables.save"
|
|
|
ab36df |
. incl "/etc/iptables-save")
|
|
|
ab36df |
diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
|
|
|
ab36df |
index 511b045..11aa2c2 100644
|
|
|
ab36df |
--- a/lenses/shellvars.aug
|
|
|
ab36df |
+++ b/lenses/shellvars.aug
|
|
|
ab36df |
@@ -189,6 +189,7 @@ module Shellvars =
|
|
|
ab36df |
sc_excl "hw-uuid" .
|
|
|
ab36df |
sc_excl "hwconf" .
|
|
|
ab36df |
sc_excl "ip*tables" .
|
|
|
ab36df |
+ sc_excl "ip*tables.save" .
|
|
|
ab36df |
sc_excl "kernel" .
|
|
|
ab36df |
sc_excl "*.pub" .
|
|
|
ab36df |
sc_excl "sysstat.ioconf" .
|