From 9daeefe05db77b68a61b9b5dfd2c6693b1d9e113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 17 Apr 2014 01:18:28 +0200 Subject: [PATCH] pungi: fix recursive partition table --- ...cursive-partition-table-on-iso-image.patch | 34 +++++++++++++++++++ pungi/pungi.spec | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pungi/fix-recursive-partition-table-on-iso-image.patch diff --git a/pungi/fix-recursive-partition-table-on-iso-image.patch b/pungi/fix-recursive-partition-table-on-iso-image.patch new file mode 100644 index 0000000..8760cfd --- /dev/null +++ b/pungi/fix-recursive-partition-table-on-iso-image.patch @@ -0,0 +1,34 @@ +From fd10f83c9384016f0f557892b187c538e9656c38 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= + +Date: Thu, 17 Apr 2014 00:22:32 +0200 +Subject: [PATCH] Fix recursive partition table on iso image +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +Organization: Invisible Things Lab +Cc: Marek Marczykowski-Górecki + +See https://bugs.mageia.org/show_bug.cgi?id=5036 + +Signed-off-by: Marek Marczykowski-Górecki +--- + src/pypungi/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py +index 67f4663..3fcd4c9 100644 +--- a/src/pypungi/__init__.py ++++ b/src/pypungi/__init__.py +@@ -1498,7 +1498,7 @@ class Pungi(pypungi.PungiBase): + + ppcbootargs.append('-hfs-bless') # must be last + +- isohybrid = ['/usr/bin/isohybrid'] ++ isohybrid = ['/usr/bin/isohybrid', '-o', '1'] + + # Check the size of the tree + # This size checking method may be bunk, accepting patches... +-- +1.8.3.1 + diff --git a/pungi/pungi.spec b/pungi/pungi.spec index 65d566d..10b1f93 100644 --- a/pungi/pungi.spec +++ b/pungi/pungi.spec @@ -16,6 +16,7 @@ Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name Patch0: support-verify-downloaded-packages.patch Patch1: disable-efi.patch Patch2: effective-nosource-option.patch +Patch3: fix-recursive-partition-table-on-iso-image.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum => 3.4.3-28, repoview, createrepo >= 0.4.11 Requires: lorax @@ -33,6 +34,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__python} setup.py build