----- Original Message -----
From: "Chris Lumens" clumens@redhat.com To: anaconda-patches@lists.fedorahosted.org Sent: Friday, February 20, 2015 5:31:40 PM Subject: [PATCH 1/4] Don't try to run new-kernel-pkg if it doesn't exist.
pyanaconda/packaging/__init__.py | 4 ++++ pyanaconda/packaging/livepayload.py | 4 ++++ 2 files changed, 8 insertions(+)
diff --git a/pyanaconda/packaging/__init__.py b/pyanaconda/packaging/__init__.py index a8388e7..7642d2f 100644 --- a/pyanaconda/packaging/__init__.py +++ b/pyanaconda/packaging/__init__.py @@ -523,6 +523,10 @@ class Payload(object):
:returns: None """
if not os.path.exists(iutil.getSysroot() +
"/usr/sbin/new-kernel-pkg"):
log.error("new-kernel-pkg does not exist - grubby wasn't
installed? skipping")
return
for kernel in self.kernelVersionList: log.info("recreating initrd for %s", kernel) if not flags.imageInstall:
diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py index f582219..ed3f073 100644 --- a/pyanaconda/packaging/livepayload.py +++ b/pyanaconda/packaging/livepayload.py @@ -164,6 +164,10 @@ class LiveImagePayload(ImagePayload): threadMgr.wait(THREAD_LIVE_PROGRESS)
# Live needs to create the rescue image before bootloader is written
if not os.path.exists(iutil.getSysroot() +
"/usr/sbin/new-kernel-pkg"):
log.error("new-kernel-pkg does not exist - grubby wasn't
installed? skipping")
return
for kernel in self.kernelVersionList: log.info("Generating rescue image for %s", kernel) iutil.execInSysroot("new-kernel-pkg",
-- 2.2.2
All 4 look good to me, ACK!
anaconda-patches mailing list anaconda-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches