almalinux/pungi
13
1
Fork 0
Code Issues Pull Requests Releases Activity

More chnages for netinst.iso/boot.iso

Browse Source
This commit is contained in:
Jesse Keating 2008-03-11 14:42:41 -04:00 committed by Jesse Keating
parent 0a4fdfe767
commit 66a6d6eafd
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog
View File

@ -1,3 +1,7 @@
* Tue Mar 11 2008 Jesse Keating <jkeating@redhat.com>
- netinst.iso was renamed to boot.iso. We want to link it
to the iso dir, but keep the netinst.iso name for now.
* Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com> * Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com>
- Fix ppc split iso generation - Fix ppc split iso generation
- Exclude repoview from isos - Exclude repoview from isos

5
pungi.spec
View File

@ -1,7 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: pungi Name: pungi
Version: 1.2.9 Version: 1.2.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: Distribution compose tool Summary: Distribution compose tool
@ -55,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Mar 11 2008 Jesse Keating <jkeating@redhat.com> - 1.2.10-1
- Handle netinst.iso being renamed to boot.iso
* Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com> - 1.2.9-1 * Wed Mar 05 2008 Jesse Keating <jkeating@redhat.com> - 1.2.9-1
- Fix ppc split iso generation - Fix ppc split iso generation
- Exclude repoview from isos - Exclude repoview from isos

2
setup.py
View File

@ -2,7 +2,7 @@ from distutils.core import setup
import glob import glob
setup(name='pungi', setup(name='pungi',
version='1.2.9', version='1.2.10',
description='Distribution compose tool', description='Distribution compose tool',
author='Jesse Keating', author='Jesse Keating',
author_email='jkeating@redhat.com', author_email='jkeating@redhat.com',

2
src/bin/pungi.py
View File

@ -121,7 +121,7 @@ if __name__ == '__main__':
today = time.strftime('%Y%m%d', time.localtime()) today = time.strftime('%Y%m%d', time.localtime())
def get_arguments(config): def get_arguments(config):
parser = OptionParser(version="%prog 1.2.9") parser = OptionParser(version="%prog 1.2.10")
def set_config(option, opt_str, value, parser, config): def set_config(option, opt_str, value, parser, config):
config.set('default', option.dest, value) config.set('default', option.dest, value)

8
src/pypungi/pungi.py
View File

@ -533,15 +533,15 @@ cost=500
# Write out a line describing the CD set # Write out a line describing the CD set
self.writeinfo('mediaset: %s' % ' '.join(isolist)) self.writeinfo('mediaset: %s' % ' '.join(isolist))
# Now copy the netinst iso # Now link the boot iso
if not self.config.get('default', 'arch') == 'source' and \ if not self.config.get('default', 'arch') == 'source' and \
os.path.exists(os.path.join(self.topdir, 'images', 'netinst.iso')): os.path.exists(os.path.join(self.topdir, 'images', 'boot.iso')):
isoname = '%s-%s-%s-netinst.iso' % (self.config.get('default', 'iso_basename'), isoname = '%s-%s-%s-netinst.iso' % (self.config.get('default', 'iso_basename'),
self.config.get('default', 'version'), self.config.get('default', 'arch')) self.config.get('default', 'version'), self.config.get('default', 'arch'))
isofile = os.path.join(self.isodir, isoname) isofile = os.path.join(self.isodir, isoname)
# copy the netinst iso to the iso dir # link the boot iso to the iso dir
shutil.copy2(os.path.join(self.topdir, 'images', 'netinst.iso'), isofile) pypungi._link(os.path.join(self.topdir, 'images', 'boot.iso'), isofile)
# shove the sha1sum into a file # shove the sha1sum into a file
sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a') sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a')