Makefile | 2 +- imgcreate/live.py | 8 +------- imgcreate/yuminst.py | 10 +++++----- tools/livecd-iso-to-disk.sh | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-)
New commits: commit 82862dbe242182012cf6bb26d0a87b129cca9c9a Author: Brian C. Lane <[email protected]> Date: Wed Apr 3 10:42:23 2013 -0700 Version 18.15 diff --git a/Makefile b/Makefile index ab3768b..791917f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 18.14 +VERSION = 18.15 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit 5546b8dbbd20dd1ab6b164e3d71fff693baf8f84 Author: Brian C. Lane <[email protected]> Date: Wed Apr 3 10:17:24 2013 -0700 Use parted to check for GPT disklabel (#947653) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 1a87869..eb7c3cc 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -519,7 +519,7 @@ checkGPT() { dev=$1 getdisk $dev - if [ "$(/sbin/fdisk -l $device 2>/dev/null |grep -c GPT)" -eq "0" ]; then + if [ "$(/sbin/parted -m $device p 2>/dev/null |grep -ic :gpt:)" -eq "0" ]; then echo "EFI boot requires a GPT partition table." echo "This can be done manually or you can run with --format" exitclean commit e539b3c7eb02b5dd4325712c771d502a3f5b5618 Author: Brian C. Lane <[email protected]> Date: Wed Apr 3 09:21:55 2013 -0700 Output details of dep check failure diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py index f753e8f..6b1698f 100644 --- a/imgcreate/yuminst.py +++ b/imgcreate/yuminst.py @@ -194,7 +194,7 @@ class LiveCDYum(yum.YumBase): return True return False - + def runInstall(self): os.environ["HOME"] = "/" try: @@ -207,19 +207,19 @@ class LiveCDYum(yum.YumBase): return res if res != 2: raise CreatorError("Failed to build transaction : %s" % str.join("\n", resmsg)) - + dlpkgs = map(lambda x: x.po, filter(lambda txmbr: txmbr.ts_state in ("i", "u"), self.tsInfo.getMembers())) self.downloadPkgs(dlpkgs) # FIXME: sigcheck? - + self.initActionTs() self.populateTs(keepold=0) deps = self.ts.check() if len(deps) != 0: - raise CreatorError("Dependency check failed!") + raise CreatorError("Dependency check failed : %s" % "\n".join(deps)) rc = self.ts.order() if rc != 0: - raise CreatorError("ordering packages for installation failed!") + raise CreatorError("ordering packages for installation failedr. rc = %s" % rc) # FIXME: callback should be refactored a little in yum sys.path.append('/usr/share/yum-cli') commit 0399b7e4630187a7212877ec67e0a8d91ac29680 Author: Brian C. Lane <[email protected]> Date: Thu Mar 28 16:26:37 2013 -0700 Properly generate kernel stanzas (#928093) diff --git a/imgcreate/live.py b/imgcreate/live.py index 47b9dcd..fedcf92 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -554,14 +554,8 @@ menu separator return template % args def __get_image_stanzas(self, isodir): - versions = [] kernels = self._get_kernel_versions() - for kernel in kernels: - for version in kernels[kernel]: - versions.append(version) - kernel_options = self._get_kernel_options() - checkisomd5 = self._has_checkisomd5() # Stanzas for insertion into the config template @@ -570,7 +564,7 @@ menu separator check = [] index = "0" - for version in versions: + for kernel, version in ((k,v) for k in kernels for v in kernels[k]): (is_xen, isDracut) = self.__copy_kernel_and_initramfs(isodir, version, index) if index == "0": self._isDracut = isDracut -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
