Attachment 620072 Details for Bug 815540 – patch to allow cmdline args

[patch] patch to allow cmdline args

0001-initial-firewall-setup-815540.patch (text/plain), 2.17 KB, created by Brian Lane on 2012-10-01 23:51:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Lane

Created: 2012-10-01 23:51:25 UTC

Size: 2.17 KB

patch

obsolete

>From f4f661f7eb8a4325b3a5e8413ec295e4ec0c20a0 Mon Sep 17 00:00:00 2001
>From: "Brian C. Lane" <bcl@redhat.com>
>Date: Mon, 1 Oct 2012 16:40:45 -0700
>Subject: [PATCH] initial firewall setup (#815540)
>
>This modifies firewall-convert-scfw-config to allow cmdline args so
>that Anaconda can use it to setup the system's initial firewall state.
>---
> src/firewall-convert-scfw-config | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
>diff --git a/src/firewall-convert-scfw-config b/src/firewall-convert-scfw-config
>index be5b31a..6dd7db3 100755
>--- a/src/firewall-convert-scfw-config
>+++ b/src/firewall-convert-scfw-config
>@@ -61,7 +61,7 @@ def _check_port(option, opt, value):
>             raise OptionError(_("%s is not a valid protocol.") % protocol, opt)
>     if failure:
>         raise OptionError(_("invalid port definition %s.") % value, opt)
>-    return (range, protocol)
>+    return (ports.strip(), protocol)
> 
> def _check_forward_port(option, opt, value):
>     result = { }
>@@ -78,7 +78,7 @@ def _check_forward_port(option, opt, value):
>                 (key == "toaddr" and checkIP(val)):
>             result[key] = val
>         elif (key == "port" or key == "toport") and getPortRange(val) > 0:
>-            result[key] = getPortRange(val)
>+            result[key] = val
>         else:
>             error = _("Invalid argument %s") % splits[0]
>             break
>@@ -296,7 +296,7 @@ class _OptionParser(OptionParser):
>         option.process(opt, value, values, self)
> 
> def _gen_parser(source=None):
>-    parser = _OptionParser(add_help_option=False, option_class=_Option)
>+    parser = _OptionParser(option_class=_Option)
>     parser._fw_source = source
>     parser._fw_exit = False
>     return parser
>@@ -341,9 +341,13 @@ def read_sysconfig_config(merge_config=None):
>         return merge_config
>     return parse_sysconfig_args(args[0], merge_config, args[1])
> 
>-# open system-config-firewall config
> 
>-conf = read_sysconfig_config()
>+if len(sys.argv) > 1:
>+    # Parse the cmdline args and setup the initial firewall state
>+    conf = parse_sysconfig_args(None)
>+else:
>+    # open system-config-firewall config
>+    conf = read_sysconfig_config()
> if not conf:
>     sys.exit(0)
> 
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 815540: 620072