Use correct firewall command version

- kickstart: use F27_Firewall, not F28_Firewall (dusty)
This commit is contained in:
Martin Kolman 2018-01-11 12:08:56 +01:00
parent 2137f4e900
commit 07d5f3e8d7
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From d3116edb3e86e4fda295c8d9a09791498d32668e Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Wed, 10 Jan 2018 10:59:26 -0500
Subject: [PATCH] kickstart: use F27_Firewall, not F28_Firewall
clumens made it F27 when he backported the patch
from the pykickstart pykickstart2 PR [1] to the f27
package [2].
[1] https://github.com/rhinstaller/pykickstart/pull/204
[2] https://src.fedoraproject.org/rpms/pykickstart/c/efdb64965ec11dc8c16c38006c2db81bda6430a5?branch=f27
---
pyanaconda/kickstart.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index b75d9be3f..100e25702 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -707,9 +707,9 @@ class Fcoe(commands.fcoe.F13_Fcoe):
return fc
-class Firewall(commands.firewall.F28_Firewall):
+class Firewall(commands.firewall.F27_Firewall):
def __init__(self, *args, **kwargs):
- commands.firewall.F28_Firewall.__init__(self, *args, **kwargs)
+ commands.firewall.F27_Firewall.__init__(self, *args, **kwargs)
self.packages = []
def setup(self):
--
2.14.3

View File

@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 27.20.4
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+ and MIT
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
@ -38,6 +38,10 @@ Patch7: 0007-Set-correct-pykickstart-version.patch
# Add support for the --use-system-defaults option for the firewall kickstart command
Patch8: 0008-kickstart-support-firewall-use-system-defaults-15264.patch
# the new firewall command functionality was backported to the F27 command in Pykickstart,
# so use that
Patch9: 0009-kickstart-use-F27_Firewall-not-F28_Firewall.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -270,6 +274,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
%configure
@ -363,6 +368,9 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Thu Jan 11 2018 Martin Kolman <mkolman@redhat.com> - 27.20.4-6
- kickstart: use F27_Firewall, not F28_Firewall (dusty)
* Mon Jan 08 2018 Martin Kolman <mkolman@redhat.com> - 27.20.4-5
- kickstart: support firewall --use-system-defaults (#1526450) (dusty)
- Set correct pykickstart version (jkonecny)