docs/livecd-creator.pod | 9 +++++++++
imgcreate/yuminst.py | 1 +
2 files changed, 10 insertions(+)
New commits:
commit 37bcbcc7154aba9d098f2c424a69359de3e7780f
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Thu Oct 14 00:09:55 2010 -0500
Add documentation for repo command extensions.
repo commands processed by livecd-creator will do substituions for
$arch, $basearch and $releasever.
diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod
index 2c78892..553f865 100644
--- a/docs/livecd-creator.pod
+++ b/docs/livecd-creator.pod
@@ -78,6 +78,15 @@ livecd-creator \
--config=/usr/share/livecd-tools/livecd-fedora-desktop.ks \
--fslabel=Fedora9-LiveCD-foo
+=head1 REPO EXTENSIONS
+
+livecd-creator provides for some extensions to the repo commands similar
+to what yum supports. The strings $arch, $basearch and $releveasever
+are replaced with the system arch, basearch and release version respectively.
+The allows the use of repo commands such as the following:
+
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+
=head1 CONTRIBUTORS
David Zeuthen, Jeremy Katz, Douglas McClendon and a team of many other contributors. See the AUTHORS file in the source distribution for the complete list of credits.
commit f29269c6c6ac947be6317a0457440c3849d93d56
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Wed Oct 13 23:37:31 2010 -0500
Provide for support for $releasever in repo commands.
Provide $releasever support similar to $basearch and $arch support in repo
commands. $releasever gets replaced by the version of the package providing
redhat-release (which is what yum uses by default).
diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py
index 7614ebb..9e54982 100644
--- a/imgcreate/yuminst.py
+++ b/imgcreate/yuminst.py
@@ -130,6 +130,7 @@ class LiveCDYum(yum.YumBase):
# takes a variable and substitutes like yum configs do
option = option.replace("$basearch", rpmUtils.arch.getBaseArch())
option = option.replace("$arch", rpmUtils.arch.getCanonArch())
+ option = option.replace("$releasever", yum.config._getsysver("/", "redhat-release"))
return option
repo = yum.yumRepo.YumRepository(name)