Two patches;
0001) Do not include boot.iso on any disc, per
https://www.redhat.com/archives/fedora-devel-list/2009-January/msg02070.html
0002) the more cosmetic patch, I just so happened to see this; extraargs
had two append() calls while "-o" and isofile were meant to be together.
The patch makes this one extend call so that no accidents happen when
someone inserts a line in between.
Kind regards,
Jeroen van Meeuwen
-kanarip
>From 40aa50ac0c341b789b840c2118f3a9445ad179a3 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <[email protected]>
Date: Fri, 30 Jan 2009 02:32:35 +0100
Subject: [PATCH] Do not include boot.iso on any disc
---
src/pypungi/__init__.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index e084054..5c03174 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -955,7 +955,7 @@ cost=500
# setup the base command
mkisofs = ['/usr/bin/mkisofs']
- mkisofs.extend(['-v', '-U', '-J', '-R', '-T', '-m', 'repoview']) # common mkisofs flags
+ mkisofs.extend(['-v', '-U', '-J', '-R', '-T', '-m', 'repoview', '-m', 'images/boot.iso']) # common mkisofs flags
x86bootargs = ['-b', 'isolinux/isolinux.bin', '-c', 'isolinux/boot.cat',
'-no-emul-boot', '-boot-load-size', '4', '-boot-info-table']
--
1.6.0.6
>From 8c4068f70f83d66ab7bd9aab32dff942e1a9ad03 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <[email protected]>
Date: Fri, 30 Jan 2009 02:33:13 +0100
Subject: [PATCH] Prevent errors from happening by accidently inserting a line between
two extraargs.append() calls with options that belong together
---
src/pypungi/__init__.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index 5c03174..8d8c07d 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -1039,8 +1039,7 @@ cost=500
extraargs.append('%s %s %s' % (self.config.get('pungi', 'name'),
self.config.get('pungi', 'version'), self.config.get('pungi', 'arch')))
- extraargs.append('-o')
- extraargs.append(isofile)
+ extraargs.extend(['-o', isofile])
if not self.config.get('pungi', 'arch') == 'source':
extraargs.append(self.topdir)
--
1.6.0.6
--
Fedora-buildsys-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/fedora-buildsys-list
