Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu Masters Of The Universe (http://www.linux-archive.org/ubuntu-masters-universe/)
-   -   Don't always attempt to load updates on kickstart installs (#677131). (http://www.linux-archive.org/ubuntu-masters-universe/489673-dont-always-attempt-load-updates-kickstart-installs-677131-a.html)

Chris Lumens 02-15-2011 02:10 PM

Don't always attempt to load updates on kickstart installs (#677131).
 
pykickstart ensures that if "updates" is given, url is set to "floppy".
Otherwise, you've either provided a URL or skipped the command entirely.
In the last case, url is "".
---
loader/kickstart.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/loader/kickstart.c b/loader/kickstart.c
index 69bb8f1..6df3040 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -497,10 +497,12 @@ static void setVnc(struct loaderData_s * loaderData, PyObject *handler) {
static void setUpdates(struct loaderData_s * loaderData, PyObject *handler) {
PyObject *url = getattr(handler, "updates", "url");

- if (!isNotEmpty(url) || objIsStr(url, "floppy"))
- flags |= LOADER_FLAGS_UPDATES;
- else if (isNotEmpty(url))
- loaderData->updatessrc = strdup(PyString_AsString(url));
+ if (isNotEmpty(url)) {
+ if (objIsStr(url, "floppy"))
+ flags |= LOADER_FLAGS_UPDATES;
+ else
+ loaderData->updatessrc = strdup(PyString_AsString(url));
+ }

Py_XDECREF(url);
}
--
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 02:07 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.