imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- imgcreate/live.py | 9 ++------- tools/edit-livecd | 2 +- tools/livecd-iso-to-disk.sh | 7 ++++--- 5 files changed, 11 insertions(+), 13 deletions(-)
New commits: commit 74da00948fc8006918db86ae6805aeec05b0f328 Author: Mads Kiilerich <[email protected]> Date: Mon Apr 16 16:44:33 2012 -0700 add support for cost in kickstart repo line (#735079) repo --cost is useful in overriding the default repo's packages. Signed-off-by: Brian C. Lane <[email protected]> diff --git a/imgcreate/creator.py b/imgcreate/creator.py index e09bdcf..35fe777 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -621,7 +621,7 @@ class ImageCreator(object): ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo yr = ayum.addRepository(name, baseurl, mirrorlist) if inc: @@ -630,6 +630,8 @@ class ImageCreator(object): yr.exclude = exc if proxy: yr.proxy = proxy + if cost is not None: + yr.cost = cost if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 9fdd683..ad69a87 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -511,7 +511,7 @@ def get_repos(ks, repo_urls = {}): if repos.has_key(repo.name): logging.warn("Overriding already specified repo %s" %(repo.name,)) - repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc) + repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost) return repos.values() diff --git a/tools/edit-livecd b/tools/edit-livecd index 948064b..bb59c7f 100755 --- a/tools/edit-livecd +++ b/tools/edit-livecd @@ -524,7 +524,7 @@ class LiveImageEditor(LiveImageCreator): # start RPM transaction ts=rpm.TransactionSet(self._instroot) for repo in kickstart.get_repos(self.ks): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo if baseurl.startswith("file://"): baseurl=baseurl[7:] elif not baseurl.startswith("/"): commit d30d1300d6ea11ec4ed41920006a9b93189402fe Author: Brian C. Lane <[email protected]> Date: Mon Apr 16 15:28:07 2012 -0700 skip copying DVD image file with skipcopy option (786037) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index d5d4db9..fe4e59b 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -615,7 +615,7 @@ checkFilesystem() { TGTFS=$(/sbin/blkid -s TYPE -o value $dev || :) if [ "$TGTFS" != "vfat" ] && [ "$TGTFS" != "msdos" ]; then if [ "$TGTFS" != "ext2" ] && [ "$TGTFS" != "ext3" ] && [ "$TGTFS" != "ext4" ] && [ "$TGTFS" != "btrfs" ]; then - echo "Target filesystem must be vfat, ext[234] or btrfs" + echo "Target filesystem ($dev:$TGTFS) must be vfat, ext[234] or btrfs" exitclean fi fi @@ -1145,7 +1145,7 @@ fi # DVD installer copy # Also copies over the source .iso if the image is a new-style LiveOS DVD (F17+) -if [ \( "$srctype" = "installer" -o "$srctype" = "netinst" \) ]; then +if [ -z "$skipcopy" -a \( "$srctype" = "installer" -o "$srctype" = "netinst" \) ]; then echo "Copying DVD image to target device." mkdir -p $TGTMNT/images/ if [ "$imgtype" = "install" ]; then commit 87af53859e0fb1e50fc05ea701f4dcc4a098ad36 Author: Brian C. Lane <[email protected]> Date: Thu Apr 12 11:48:13 2012 -0700 remove kernel and initrd from EFI/BOOT (#811438) The kernel and initrd don't need to be in the EFI/BOOT directory, they are already in the isolinux dir. A side-effect of this is that the efiboot.img and macboot.img were including them as well, causing the image size to be larger than it needed to be. livecd-iso-to-disk has also been adjusted to handle the new path in the EFI boot config. diff --git a/imgcreate/live.py b/imgcreate/live.py index 49fbf3c..656f49c 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -712,8 +712,8 @@ hiddenmenu args["rootlabel"] = "CDLABEL=%(fslabel)s" % args return """title %(long)s findiso - kernel /EFI/BOOT/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s - initrd /EFI/BOOT/initrd%(index)s.img + kernel /isolinux/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s + initrd /isolinux/initrd%(index)s.img """ %args def __get_efi_image_stanzas(self, isodir, name): @@ -757,11 +757,6 @@ hiddenmenu shutil.rmtree(isodir + "/EFI") return - for f in os.listdir(isodir + "/isolinux"): - os.link("%s/isolinux/%s" %(isodir, f), - "%s/EFI/BOOT/%s" %(isodir, f)) - - cfg = self.__get_basic_efi_config(name = self.name, timeout = self._timeout) cfg += self.__get_efi_image_stanzas(isodir, self.name) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 1ec42c6..d5d4db9 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1253,6 +1253,7 @@ fi # EFI images are in $SYSLINUXPATH now if [ -n "$efi" ]; then + sed -i -e "s;/isolinux/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi commit 7b58dc092fbf326cbb66be73dcd27326d5786afe Author: Brian C. Lane <[email protected]> Date: Thu Apr 12 11:08:15 2012 -0700 fix syntax problem in detectsrctype diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index b5adf1e..1ec42c6 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -704,7 +704,7 @@ detectsrctype() { srctype=live return fi - if [ -e $SRCMNT/images/install.img -o $SRCMNT/isolinux/initrd.img ]; then + if [ -e $SRCMNT/images/install.img -o -e $SRCMNT/isolinux/initrd.img ]; then if [ -n "$packages" ]; then srctype=installer else -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
