Branch 'f17-branch' - Makefile
by Brian C. Lane
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6cdfcfeea5a8cabb6ebf7ffd8c70969bcdcf057f
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Apr 16 17:29:05 2012 -0700
Version 17.8
diff --git a/Makefile b/Makefile
index 0cc83ac..1f504e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 17.7
+VERSION = 17.8
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
12 years
Changes to 'refs/tags/livecd-tools-18.3'
by Brian C. Lane
Tag 'livecd-tools-18.3' created by Brian C. Lane <bcl(a)redhat.com> at 2012-04-17 00:23 +0000
Tag as livecd-tools-18.3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEVAwUAT4y37BF+jBaO/jp/AQLWdwgAnLwm8FFYM4hNgQpr+u+lDOg1ESVz282d
ssecljxHdXo+ts6ZHDxg94Casva0wf37Ktg4Mlawa97rR7FUfpVSmRyrwwyDjQEn
7TdyrBAyPL51xnupqJUKo6aXdjQZFr9060vQ73Pn+j73/zVq5dHwPHO8UsNW7UV5
JOndTj9CXSbquEpKsQR9dCGNvd6hVzlpLJ1k837gDSg/wLrMaBeCY2++eIGLFcMc
htKkn5AUTppRWfIp4PKfQbV5jUTtdbwBjeiKHTnzy+VbmyEOqt/j7lQjGbtKqkin
GkNsMxzi6pd9H6qW9U/cwgUZSzmk2in2nTBU3Tv7lyKYWZWwoGcHZQ==
=7EJP
-----END PGP SIGNATURE-----
Changes since livecd-tools-18.2:
Brian C. Lane (4):
fix syntax problem in detectsrctype
remove kernel and initrd from EFI/BOOT (#811438)
skip copying DVD image file with skipcopy option (786037)
Version 18.3
Mads Kiilerich (1):
add support for cost in kickstart repo line (#735079)
---
Makefile | 2 +-
imgcreate/creator.py | 4 +++-
imgcreate/kickstart.py | 2 +-
imgcreate/live.py | 9 ++-------
tools/edit-livecd | 2 +-
tools/livecd-iso-to-disk.sh | 7 ++++---
6 files changed, 12 insertions(+), 14 deletions(-)
---
12 years
Changes to 'refs/tags/livecd-tools-18.2'
by Brian C. Lane
Tag 'livecd-tools-18.2' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:02 +0000
Tag as livecd-tools-18.2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEVAwUAT0+rnRF+jBaO/jp/AQLorQgAhqaqn7Yy9ShBhSKLStaNI2+gIQWpwpC4
/X6vBnc/mYxgUuw5MqtcbvG4OY6C7UfiyeF8AtZ06NE5XhNyOG44v/0+NN2ZyA7y
sYYNsyx18YMXoxuyRy6ZzXJP/Gk4bC5+ul4y9+v5v0lfwXZmkGY/CGxej+3ZO8Rg
5YqeSbINX+9AJKnvxkqW0cqe7MgjLQCBqZeakHGlFaNc7+wbARCuiLxY1dp5BTpa
H5YjoJqicIlsDh2IJWqRXrhtRqVYezllwFPlL1CUP5JZNiK0jRuRxHYjdqvPSdN/
xP19vGHAzTdEm648kUYz+GWOKNSBmj6HFXxOveyO9Qiz38/2inXx4g==
=e2rE
-----END PGP SIGNATURE-----
Changes since livecd-tools-18.1:
Brian C. Lane (2):
livecd-iso-to-disk: Add 2MB slop to calculation
Version 18.2
Matthew Garrett (2):
Add support for generating EFI-bootable hybrid images
Change EFI/boot to EFI/BOOT
---
Makefile | 2 -
imgcreate/live.py | 58 ++++++++++++++++++++++++++++++--------------
tools/edit-livecd | 4 +--
tools/livecd-iso-to-disk.sh | 8 +++---
4 files changed, 47 insertions(+), 25 deletions(-)
---
12 years
Changes to 'refs/tags/livecd-tools-17.7'
by Brian C. Lane
Tag 'livecd-tools-17.7' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:10 +0000
Tag as livecd-tools-17.7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEVAwUAT0+tkxF+jBaO/jp/AQJYGAgAndUL+HuyEiBszWosFa4RkojdGnOQaYTL
XD9ENqS4TyhS2rHuxOOnPfksgBJeJYXLUziOY8AmC5OI19GW8AoxRDFsvi8wC3M9
l77BVA3nCtW5JWCQ/3HCRXUWTUUZX/38m8klRkkLXMvjm8cZ22dwBf7Y650dNiZ8
TjZBJVHOziGnZ81V6EeEYOY7jU/WyIL8EwHaEdL+6lLeiVjhV7AUpxHPyiTRyDpm
5+UH+oWXbhvWO1oWgOwapB2ARe0D5FiSI3AHyQUNvcGg0PhSV4G9ty1o2OaF6Uik
16w+Avgen0pxIzZILSJ2wJYrZrDA55ZERrXMKn+qiSz9XSoFgBkqJQ==
=rR8F
-----END PGP SIGNATURE-----
Changes since livecd-tools-17.6:
Brian C. Lane (2):
livecd-iso-to-disk: Add 2MB slop to calculation
Version 17.6
Matthew Garrett (2):
Add support for generating EFI-bootable hybrid images
Change EFI/boot to EFI/BOOT
---
Makefile | 2 -
imgcreate/live.py | 58 ++++++++++++++++++++++++++++++--------------
tools/edit-livecd | 4 +--
tools/livecd-iso-to-disk.sh | 8 +++---
4 files changed, 47 insertions(+), 25 deletions(-)
---
12 years
Changes to 'refs/tags/livecd-tools-16.11'
by Brian C. Lane
Tag 'livecd-tools-16.11' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:21 +0000
Tag as livecd-tools-16.11
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEVAwUAT0+wExF+jBaO/jp/AQIAfQgAov5CqdqXi21GaXNbchiv4NZ2sVMcGYxf
OLAJ4WnB68fmiLd1wgfoLAbg5COQWAzuDisZzKJNmBdD33DISNGdcK6nPqLmkCpg
fy4bEYxp6gpOGexVK3bMsaUFv8zq08maX7Pn26fbQCxV69BuTsRcI2PsYAN+bs1z
SwDI3aT6XvMctfbVfxkBPfZEqeSnU5KXD03fT4/0YUQMLHZ2OsEujEZBgXhZCYhY
von6Y+0e8Au9SonNV4Xzuw1e8jv1fHJMniEgQtUZQ9OJZ1nTRo9UgGZz9k7CgyU6
fecbgIjAiGVqnl7rAnytR+rV7epyvE2uBaT/UchzYXSZ9e8DNNFTpA==
=HEdC
-----END PGP SIGNATURE-----
Changes since livecd-tools-16.10:
Alan Pevec (1):
edit-livecd: -k --kickstart option
Brian C. Lane (9):
dracut needs dmsquash-live explicitly included
Use dracut.conf.d instead fo dracut.conf
Fix the fix for dracut modules (#766955)
Set base_persistdir (#741614)
selinux may be off on the host, skip mount (#737064)
imgcreate: fix typo in ResizeError
livecd-iso-to-disk: create partition for iso
livecd-iso-to-disk: Add 2MB slop to calculation
Version 16.11
Joey Boggs (2):
add missing selinux_mountpoint class object to edit-livecd
check for valid script path before editing livecd image and update usage options confusion
Matthew Garrett (2):
Add support for generating EFI-bootable hybrid images
Change EFI/boot to EFI/BOOT
---
Makefile | 2
imgcreate/creator.py | 10 +
imgcreate/fs.py | 2
imgcreate/kickstart.py | 8 +
imgcreate/live.py | 63 +++++++----
imgcreate/yuminst.py | 1
tools/edit-livecd | 185 ++++++++++++++++++++++++++++----
tools/livecd-iso-to-disk.sh | 250 ++++++++++++++++++++++++++++++--------------
8 files changed, 397 insertions(+), 124 deletions(-)
---
12 years
Changes to 'refs/tags/livecd-tools-15.12'
by Brian C. Lane
Tag 'livecd-tools-15.12' created by Brian C. Lane <bcl(a)redhat.com> at 2012-03-01 17:28 +0000
Tag as livecd-tools-15.12
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEVAwUAT0+x1RF+jBaO/jp/AQK76gf/YY0v1kKl+ACk0OLlGYSjSJcGA5WwfvzB
se9q8+oDsf2CSWVxR5D03WHltmBo/LtwAixK5+AFNl2KHs02WLcXyV24D1N69b8+
iM2oGPhK7BAwQFR4+DwK/dW9hG+V/DObu9k2xHSdJ4fK9XTL05LJ21v8QRsfOoT1
gwXh5v+hPJMyV0gr2/QzlhJEj361G78kHgf9FzFNiUvxDKGCWiHtCgJ2Kw9szk8S
oRKNPtSj2nnOP8TuUx5qOFblb4u2G7udID+Bg5aNFQTN31giIJOXQMVNkWoEgxjg
kg4VzF70Ul5jiuGTTUWuRglvfsqJRmafVnKocJ/TsXCTq6jG7q7ptA==
=5OHc
-----END PGP SIGNATURE-----
Changes since livecd-tools-15.11:
Alan Pevec (1):
edit-livecd: -k --kickstart option
Brian C. Lane (8):
Install edit-livecd to /usr/bin
dracut needs dmsquash-live explicitly included
Use dracut.conf.d instead fo dracut.conf
Fix the fix for dracut modules (#766955)
Set base_persistdir (#741614)
livecd-iso-to-disk: create partition for iso
livecd-iso-to-disk: Add 2MB slop to calculation
Version 15.12
Joey Boggs (2):
add missing selinux_mountpoint class object to edit-livecd
check for valid script path before editing livecd image and update usage options confusion
---
Makefile | 3
imgcreate/creator.py | 4
imgcreate/kickstart.py | 8 +
imgcreate/live.py | 5
imgcreate/yuminst.py | 1
tools/edit-livecd | 181 ++++++++++++++++++++++++++---
tools/livecd-iso-to-disk.sh | 266 ++++++++++++++++++++++++++++++--------------
7 files changed, 363 insertions(+), 105 deletions(-)
---
12 years
Makefile
by Brian C. Lane
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 997366b4c6f16fed4f90638ab5851776071b7b50
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Apr 16 17:22:31 2012 -0700
Version 18.3
diff --git a/Makefile b/Makefile
index 8e67b05..c1ed0ac 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 18.2
+VERSION = 18.3
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
12 years
Branch 'f16-branch' - 4 commits - imgcreate/creator.py imgcreate/kickstart.py imgcreate/live.py tools/edit-livecd tools/livecd-iso-to-disk.sh
by Brian C. Lane
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 <mads(a)kiilerich.com>
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 <bcl(a)redhat.com>
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 <bcl(a)redhat.com>
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 <bcl(a)redhat.com>
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 <bcl(a)redhat.com>
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
12 years
Branch 'f17-branch' - imgcreate/creator.py imgcreate/kickstart.py tools/edit-livecd
by Brian C. Lane
imgcreate/creator.py | 4 +++-
imgcreate/kickstart.py | 2 +-
tools/edit-livecd | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit ca55b00a50c286e7aa534c8fba4b531e634006a1
Author: Mads Kiilerich <mads(a)kiilerich.com>
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 <bcl(a)redhat.com>
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("/"):
12 years
imgcreate/creator.py imgcreate/kickstart.py tools/edit-livecd
by Brian C. Lane
imgcreate/creator.py | 4 +++-
imgcreate/kickstart.py | 2 +-
tools/edit-livecd | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit afea60cdbe85a9e770d8fc7bf3fd8b1ffb4d743a
Author: Mads Kiilerich <mads(a)kiilerich.com>
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 <bcl(a)redhat.com>
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("/"):
12 years