[PATCH] Add proxy support to livecd-creator (#649546)
by Brian C. Lane
This changes the previous return value for kickstart.get_repos to add
the proxy info.
---
imgcreate/creator.py | 6 ++++--
imgcreate/kickstart.py | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 20be148..1f1e5b8 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -638,13 +638,15 @@ class ImageCreator(object):
ayum.setup(yum_conf, self._instroot)
for repo in kickstart.get_repos(self.ks, repo_urls):
- (name, baseurl, mirrorlist, inc, exc) = repo
-
+ (name, baseurl, mirrorlist, proxy, inc, exc) = repo
+
yr = ayum.addRepository(name, baseurl, mirrorlist)
if inc:
yr.includepkgs = inc
if exc:
yr.exclude = exc
+ if proxy:
+ yr.proxy = proxy
if kickstart.exclude_docs(self.ks):
rpm.addMacro("_excludedocs", "1")
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 9a2145a..33859d6 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -502,14 +502,15 @@ def get_repos(ks, repo_urls = {}):
baseurl = repo.baseurl
mirrorlist = repo.mirrorlist
-
+ proxy = repo.proxy
+
if repo.name in repo_urls:
baseurl = repo_urls[repo.name]
mirrorlist = None
if repos.has_key(repo.name):
logging.warn("Overriding already specified repo %s" %(repo.name,))
- repos[repo.name] = (repo.name, baseurl, mirrorlist, inc, exc)
+ repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc)
return repos.values()
--
1.7.3.2
13 years, 5 months
Hi, I'm the new livecd-tools maintainer
by Brian C. Lane
Hi, I'm Brian, and I'm you're new livecd-tools maintainer :)
Since the tools are closely involved with the installer we wanted to
move ownership back to someone on the anaconda team.
I've been a user of the tools in previous jobs, so am familiar with some
aspects of them -- I created a liveusb to auto-install Point of Sale
systems with a customized version of F9, and I regularly use
livecd-iso-to-disk when testing new anaconda builds.
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
13 years, 5 months
F13 and F12 tracking master?
by Brian C. Lane
I have updated master and f14 (it will be in updates-testing until it
gets enough karma) to v0.3.5 which includes epoch+version and removes
the patches which have been committed to upstream (all of them).
Currently the f13 and f12 branches are not tracking master, and it looks
like some back-porting has to be done to keep them in sync. Does anyone
see any reason why we can't keep all branches at the same version?
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
13 years, 5 months
Makefile
by Brian C. Lane
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9eee64f2c0afed031be24e0ab8edea1b6731e41a
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Nov 1 14:31:29 2010 -0700
Changing version to NVR
This will be v0.3.5
diff --git a/Makefile b/Makefile
index a52b2a5..814e239 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 034
+VERSION = 0.3.5
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
13 years, 5 months
