rel-eng/packages/cobbler20 | 2 +-
spec-tree/cobbler20/cobbler20.spec | 7 ++++++-
spec-tree/cobbler20/lvm_storage.patch | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 9d16493a920391061c7f469ad824a8f68876957b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 21 15:25:33 2013 +0100
Automatic commit of package [cobbler20] minor release [2.0.11-14].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20
index c2b3a77..505c3af 100644
--- a/rel-eng/packages/cobbler20
+++ b/rel-eng/packages/cobbler20
@@ -1 +1 @@
-2.0.11-13 spec-tree/cobbler20/
+2.0.11-14 spec-tree/cobbler20/
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index fbb81fb..8f4dbc7 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -7,7 +7,7 @@ Name: cobbler20
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 13%{?dist}
+Release: 14%{?dist}
Source0: cobbler-%{version}.tar.gz
Source1: cobblerd.service
Patch0: catch_cheetah_exception.patch
@@ -448,6 +448,9 @@ Web interface for Cobbler that allows visiting
http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Thu Feb 21 2013 Tomas Lestach <tlestach(a)redhat.com> 2.0.11-14
+- 768451 - lvm storage koan fix
+
* Mon Feb 18 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.0.11-13
- update tftp dependency for systemd
commit a4cbff6599f3606e7791fd969144c2f61d1d675d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 21 14:10:02 2013 +0100
768451 - lvm storage koan fix
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 9ade149..fbb81fb 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -11,6 +11,7 @@ Release: 13%{?dist}
Source0: cobbler-%{version}.tar.gz
Source1: cobblerd.service
Patch0: catch_cheetah_exception.patch
+Patch1: lvm_storage.patch
Group: Applications/System
Requires: python >= 2.3
@@ -93,6 +94,7 @@ a XMLRPC API for integration with other applications.
%prep
%setup -q -n cobbler-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__python} setup.py build
diff --git a/spec-tree/cobbler20/lvm_storage.patch
b/spec-tree/cobbler20/lvm_storage.patch
new file mode 100644
index 0000000..03952b3
--- /dev/null
+++ b/spec-tree/cobbler20/lvm_storage.patch
@@ -0,0 +1,12 @@
+diff -ru cobbler-2.0.11.orig/koan/app.py cobbler-2.0.11/koan/app.py
+--- cobbler-2.0.11.orig/koan/app.py 2013-02-21 14:04:29.353417463 +0100
++++ cobbler-2.0.11/koan/app.py 2013-02-21 14:06:04.517743333 +0100
+@@ -1515,7 +1515,7 @@
+ raise InfoException, "LVM creation failed"
+
+ # partition location
+- partition_location = "/dev/mapper/%s-%s" %
(location,name.replace('-','--'))
++ partition_location = "/dev/%s/%s" % (location,name)
+
+ # check whether we have SELinux enabled system
+ args = "/usr/sbin/selinuxenabled"