From: Albert <asyriy@mirantis.com>
Date: Wed, 27 Jul 2016 13:26:02 +0000 (+0300)
Subject: Fix for mangling kernel options when the key --in-place is used.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F23712%2F3;p=packages%2Fcentos7%2Fcobbler.git

Fix for mangling kernel options when the key --in-place is used.

Closes-Bug: #1603615
Change-Id: I4525a1f33784f3354516c329a11477f40f7075f7
---

diff --git a/Mirantis-mangling-kopts-bugfix.patch b/Mirantis-mangling-kopts-bugfix.patch
new file mode 100644
index 0000000..27b8c4d
--- /dev/null
+++ b/Mirantis-mangling-kopts-bugfix.patch
@@ -0,0 +1,48 @@
+cobbler/pxegen.py |  1 +
+ cobbler/utils.py  | 21 +++++++++++++++++++++
+ 2 files changed, 22 insertions(+)
+
+diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py
+index a9a5940..fbc0743 100644
+--- a/cobbler/pxegen.py
++++ b/cobbler/pxegen.py
+@@ -775,6 +775,7 @@ class PXEGen:
+ 
+         append_line = ""
+         kopts = blended.get("kernel_options", dict())
++        kopts = utils.revert_strip_none(kopts)
+         # support additional initrd= entries in kernel options.
+         if "initrd" in kopts:
+             append_line = ",%s" % kopts.pop("initrd")
+diff --git a/cobbler/utils.py b/cobbler/utils.py
+index fa6b534..56d21e6 100644
+--- a/cobbler/utils.py
++++ b/cobbler/utils.py
+@@ -2194,6 +2194,27 @@ def strip_none(data, omit_none=False):
+ 
+     return data
+ 
++def revert_strip_none(data):
++    """
++    Does the opposite to strip_none
++    """
++    if isinstance(data, str) and data.strip() == '~':
++        return None
++
++    if isinstance(data, list):
++        data2 = []
++        for x in data:
++            data2.append(revert_strip_none(x))
++        return data2
++
++    if isinstance(data, dict):
++        data2 = {}
++        for key in data.keys():
++            data2[key] = revert_strip_none(data[key])
++        return data2
++
++    return data
++
+ def cli_find_via_xmlrpc(remote, otype, options):
+     """
+     Given an options object and a remote handle, find options matching
diff --git a/cobbler.spec b/cobbler.spec
index ef214d6..93f731a 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -16,7 +16,7 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.6.9
-Release: 1%{?dist}~mos11
+Release: 1%{?dist}~mos12
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
 Patch0: cobbler-virtinstall.patch
@@ -30,6 +30,8 @@ Patch2: cobbler-django17.patch
 Patch3: Mirantis-Add-ALLOWED_HOSTS-for-settings.patch
 # Add signatures for Ubuntu 16.04 and Fedora 24
 Patch4: Mirantis-Signatures-for-Ubuntu-16.04-and-Fedora-24.patch
+# Fix bug 1603615 - mangling kernel options with the key --in-place
+Patch5: Mirantis-mangling-kopts-bugfix.patch
 
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -96,6 +98,7 @@ other applications.
 %patch2 -p1 -b .django17
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %endif
 
 %build
@@ -291,6 +294,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Tue Jul 27 2016 Albert Syriy <mos-linux-team@mirantis.com> - 2.6.9-1~mos12
+- Add patch to fix the LP bug 1603615 (mangling kernel options)
+
 * Tue Jun 13 2016 Dmitry Teselkkin <mos-linux-team@mirantis.com> - 2.6.9-1~mos11
 - Add patch to add signatures for Ubuntu 16.04