From: "Brian C. Lane" bcl@redhat.com
--- lorax.spec | 12 +++++++++++- rel-eng/packages/lorax | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lorax.spec b/lorax.spec index 1191863..ea76217 100644 --- a/lorax.spec +++ b/lorax.spec @@ -1,7 +1,7 @@ %define debug_package %{nil}
Name: lorax -Version: 18.23 +Version: 18.24 Release: 1%{?dist} Summary: Tool for creating the anaconda install images
@@ -84,6 +84,16 @@ make DESTDIR=$RPM_BUILD_ROOT install
%changelog +* Fri Dec 14 2012 Brian C. Lane bcl@redhat.com 18.24-1 +- imgutils: use -s for kpartx, wait for device creation (bcl@redhat.com) +- livemedia-creator: Use SELinux Permissive mode (bcl@redhat.com) +- livemedia-creator: use cmdline mode (bcl@redhat.com) +- use correct variable for upgrade image on s390 (dan@danny.cz) +- only ix86/x86_64 and ppc/ppc64 need grub2 (dan@danny.cz) +- no mount (sub-)package since RHEL-2 (dan@danny.cz) +- Correct argument to installupgradeinitrd. (dmarlin@redhat.com) +- Added fedup requires to spec (bcl@redhat.com) + * Wed Dec 05 2012 Brian C. Lane bcl@redhat.com 18.23-1 - remove multipath rules (#880263) (bcl@redhat.com) - add installupgradeinitrd function and use it to install the upgrade initrds diff --git a/rel-eng/packages/lorax b/rel-eng/packages/lorax index 52a8298..5beaf90 100644 --- a/rel-eng/packages/lorax +++ b/rel-eng/packages/lorax @@ -1 +1 @@ -18.23-1 / +18.24-1 /
From: Daniel Mach dmach@redhat.com
--- lorax.spec | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/lorax.spec b/lorax.spec index ea76217..531fb43 100644 --- a/lorax.spec +++ b/lorax.spec @@ -34,8 +34,12 @@ Requires: util-linux Requires: xz Requires: yum Requires: pykickstart + +%if 0%{?fedora} +# Fedora specific deps Requires: fedup-dracut Requires: fedup-dracut-plymouth +%endif
%ifarch %{ix86} x86_64 Requires: syslinux >= 4.02-5
--- src/pylorax/__init__.py | 29 +++++++++++++++-------------- src/sbin/lorax | 5 ++++- 2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index 95f912f..00db2c2 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -135,7 +135,7 @@ class Lorax(BaseLoraxClass):
def run(self, ybo, product, version, release, variant="", bugurl="", isfinal=False, workdir=None, outputdir=None, buildarch=None, volid=None, - domacboot=True, remove_temp=False): + domacboot=True, doupgrade=True, remove_temp=False):
assert self._configured
@@ -283,19 +283,20 @@ class Lorax(BaseLoraxClass): anaconda_args = dracut_args + ["--add", "anaconda pollcdrom"] treebuilder.rebuild_initrds(add_args=anaconda_args)
- # Build upgrade.img. It'd be nice if these could coexist in the same - # image, but that would increase the size of the anaconda initramfs, - # which worries some people (esp. PPC tftpboot). So they're separate. - try: - # If possible, use the 'fedup' plymouth theme - themes = runcmd_output(['plymouth-set-default-theme', '--list'], - root=installroot) - if 'fedup' in themes.splitlines(): - os.environ['PLYMOUTH_THEME_NAME'] = 'fedup' - except RuntimeError: - pass - upgrade_args = dracut_args + ["--add", "system-upgrade"] - treebuilder.rebuild_initrds(add_args=upgrade_args, prefix="upgrade") + if doupgrade: + # Build upgrade.img. It'd be nice if these could coexist in the same + # image, but that would increase the size of the anaconda initramfs, + # which worries some people (esp. PPC tftpboot). So they're separate. + try: + # If possible, use the 'fedup' plymouth theme + themes = runcmd_output(['plymouth-set-default-theme', '--list'], + root=installroot) + if 'fedup' in themes.splitlines(): + os.environ['PLYMOUTH_THEME_NAME'] = 'fedup' + except RuntimeError: + pass + upgrade_args = dracut_args + ["--add", "system-upgrade"] + treebuilder.rebuild_initrds(add_args=upgrade_args, prefix="upgrade")
logger.info("populating output tree and building boot images") treebuilder.build() diff --git a/src/sbin/lorax b/src/sbin/lorax index f3aa9c3..2a66cd3 100755 --- a/src/sbin/lorax +++ b/src/sbin/lorax @@ -107,6 +107,8 @@ def main(args): help="volume id", metavar="STRING") optional.add_option("--nomacboot", help="", action="store_false", default=True, dest="domacboot") + optional.add_option("--noupgrade", help="", + action="store_false", default=True, dest="doupgrade") optional.add_option("--logfile", default="./lorax.log", help="Path to logfile") optional.add_option("--tmp", default="/var/tmp", @@ -169,7 +171,8 @@ def main(args): lorax.run(yb, opts.product, opts.version, opts.release, opts.variant, opts.bugurl, opts.isfinal, workdir=tempdir, outputdir=outputdir, buildarch=opts.buildarch, - volid=opts.volid, domacboot=opts.domacboot, remove_temp=True) + volid=opts.volid, domacboot=opts.domacboot, doupgrade=opts.doupgrade, + remove_temp=True)
def get_yum_base_object(installroot, repositories, mirrorlists=[],
anaconda-devel@lists.fedoraproject.org
-
Martin Gracik