Anaconda-devel March 2011

anaconda-devel@lists.fedoraproject.org

22 participants
107 discussions

[PATCH master] Fix setting of loaderData->method from repo= cmdline option.
by Radek Vykydal 02 Mar '11

02 Mar '11

There was double "repo=" if branch. The second one (few lines below the removed) is the right one. --- loader/loader.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 737386c..f30adb9 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1060,8 +1060,6 @@ static void parseCmdLineFlags(struct loaderData_s * loaderData, } else if (!strcasecmp(k, "method")) { logMessage(WARNING, "method= is deprecated. Please use repo= instead."); loaderData->instRepo = g_strdup(v); - } else if (!strcasecmp(k, "repo")) { - loaderData->instRepo = g_strdup(v); } else if (!strcasecmp(k, "stage2")) { logMessage(WARNING, "stage2= is deprecated. Please use repo= instead."); flags |= LOADER_FLAGS_ASKMETHOD; -- 1.7.2

2 1

[rhel6-branch][master] make sure remounts work
by David Cantrell 01 Mar '11

01 Mar '11

Annoying to track down. For rhel6-branch and master. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

2 2

[PATCH master f15-branch 0/2] Fixup findExistingRootDevices
by Brian C. Lane 01 Mar '11

01 Mar '11

Probably not enough impact to go into f15 until after Alpha. Brian C. Lane (2): Change upgrade to use findExistingRootDevices (#681267) Fixup upgrade test for findExistingRoots change (#681267) pyanaconda/iw/examine_gui.py | 2 +- tests/pyanaconda_test/upgrade_test.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) -- 1.7.4

2 3

Network: port of rhel patches to master
by Radek Vykydal 01 Mar '11

01 Mar '11

This is port of what have been done in rhel 6.1. I am sending it for review because changes in kickstart made the port not so straightforward, and also to sum up the changes of networking on master. It is all tested with F15 Alpha TC2, It would be nice to have the changes already in F15 but there is no haste I guess. I think I need to wait for F16 classes in pykickstart to adapt its part of patches before pushing, right Chris? The major changes on master are: * kickstart network --activate option was added (activates devices, also additional, in loader) * reactivation of device in kickstart was restored (as in rhel, in master it was removed probably with commit 1980e9d377aa6089ae96740cd85593ec18d5344d) * network is not activated automatically if in case of non-network install (as in rhel, in master changed with commit 9767cb5fce174e8fcf28d06ad6f48384129a7cd4) Now --activate option can be used conveniently to activate the device in non-network installs. Details are here: http://fedoraproject.org/wiki/Anaconda/Network#kickstart As for documentation, I suppose the wiki should reflect last release (not rawhide), right? I want to update it soon. Also to look at Fedora Installation Guide (I've already sent update to RHEL Installation Guide https://bugzilla.redhat.com/show_bug.cgi?id=679104) Radek

2 20

[PATCH] Initialize locale before the kickstart/virtio check (#679702)
by Martin Sivak 01 Mar '11

01 Mar '11

--- loader/lang.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/loader/lang.c b/loader/lang.c index 651c1a0..4caaeeb 100644 --- a/loader/lang.c +++ b/loader/lang.c @@ -237,20 +237,6 @@ static int setupLanguage(int choice, int forced) { pid_t localedef_pid; logMessage(DEBUGLVL, "going to set language to %s", languages[choice].lc_all); - /* load the language only if it is displayable. if they're using - * a serial console or iSeries vioconsole, we hope it's smart enough */ - if ((strcmp(languages[choice].font, "latarcyrheb-sun16") && !FL_SERIAL(flags) && - !FL_VIRTPCONSOLE(flags) && !isVioConsole())) { - if (forced == 1) return 0; - - newtWinMessage("Language Unavailable", "OK", - "%s display is unavailable in text mode. The " - "installation will continue in English until the " - "display of %s is possible.", languages[choice].lang, - languages[choice].lang); - setLangEnv(english); - return 0; - } /* Parse locale parts out of locale name. @@ -316,6 +302,21 @@ static int setupLanguage(int choice, int forced) { if (locale_mod) free(locale_mod); if (locale_p) free(locale_p); + /* load the language only if it is displayable. if they're using + * a serial console or iSeries vioconsole, we hope it's smart enough */ + if ((strcmp(languages[choice].font, "latarcyrheb-sun16") && !FL_SERIAL(flags) && + !FL_VIRTPCONSOLE(flags) && !isVioConsole())) { + if (forced == 1) return 0; + + newtWinMessage("Language Unavailable", "OK", + "%s display is unavailable in text mode. The " + "installation will continue in English until the " + "display of %s is possible.", languages[choice].lang, + languages[choice].lang); + setLangEnv(english); + return 0; + } + setLangEnv (choice); isysLoadFont(); @@ -335,7 +336,6 @@ static int setupLanguage(int choice, int forced) { newtPushHelpLine(_(bottomHelpLine)); return 0; - } /* this is pretty simple. we want to break down the language specifier -- 1.7.4

2 1

[RHEL5] [PATCH] Make sure we select the right net device when iBFT is used (#643774)
by Martin Sivak 01 Mar '11

01 Mar '11

Signed-Off-By: Martin Sivak <msivak(a)redhat.com> --- loader2/net.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/loader2/net.c b/loader2/net.c index 91082d1..9e5733d 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -2296,10 +2296,8 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { logMessage(INFO, "looking for iBFT configured device %s with link", ibftmacaddr); lookForLink = 0; - for (i = 0; devs[i]; i++) { - if (!devs[i]->device) - continue; - devmacaddr = nl_mac2str(devs[i]->device); + for (i = 0; i < deviceNums; i++) { + devmacaddr = nl_mac2str(devices[i]); if(!strcasecmp(devmacaddr, ibftmacaddr)){ logMessage(INFO, "%s has the right MAC (%s), checking for link", devmacaddr, devices[i]); free(devmacaddr); @@ -2437,10 +2435,10 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { /* turn off the non-active interface. this should keep things from * breaking when we need the interface to do the install as long as * you keep using that device */ - for (i = 0; devs[i]; i++) { + for (i = 0; i < deviceNum; i++) { if (strcmp(loaderData->netDev, devices[i])) if (!FL_TESTING(flags)) - clearInterface(devs[i]->device); + clearInterface(devices[i]); } return LOADER_OK; -- 1.7.4

2 1

[PATCH] Use yum's new headerless callback mode
by Panu Matilainen 01 Mar '11

01 Mar '11

This enables yum's new callback mode which uses the associated txmbr as the callback key instead of (header, rpmpath) tuples, simplifying the callback code and avoiding unnecessary memory bloat. This differs a bit from what was originally discussed for the headerless callback but it's even nicer this way. Some further cleanups are possible, eg it would no longer be necessary to track self.inProgressPo but keeping this to minimum for now. Note that this relies on a feature which doesn't yet exist in any released yum version and in rawhide only since today, so you might want a different version which is compatible with both modes. Ain't hard to do at all and can supply such a patch if that's what you want, consider this more of an demonstration of what the new callback looks like. --- anaconda.spec.in | 2 +- pyanaconda/yuminstall.py | 31 ++++++++----------------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/anaconda.spec.in b/anaconda.spec.in index bbbe1e8..cd79d34 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define pykickstartver 1.81 %define rpmpythonver 4.2-0.61 %define slangver 2.0.6-2 -%define yumver 2.9.2 +%define yumver 3.2.29-8 %define partedver 1.8.1 %define pypartedver 2.5-2 %define syscfgdatever 1.9.48 diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index 93e557b..fd7fb00 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -144,18 +144,7 @@ class AnacondaCallback: self.progressWindow.pop() if what == rpm.RPMCALLBACK_INST_OPEN_FILE: - (hdr, rpmloc) = h - # hate hate hate at epochs... - epoch = hdr['epoch'] - if epoch is not None: - epoch = str(epoch) - txmbrs = self.ayum.tsInfo.matchNaevr(hdr['name'], hdr['arch'], - epoch, hdr['version'], - hdr['release']) - if len(txmbrs) == 0: - raise RuntimeError, "Unable to find package %s-%s-%s.%s" %(hdr['name'], hdr['version'], hdr['release'], hdr['arch']) - po = txmbrs[0].po - + po = h.po repo = self.repos.getRepo(po.repoid) pkgStr = "%s-%s-%s.%s" % (po.name, po.version, po.release, po.arch) @@ -195,8 +184,6 @@ class AnacondaCallback: self.initWindow.pop() self.initWindow = None - (hdr, rpmloc) = h - fn = self.openfile.name self.openfile.close() self.openfile = None @@ -230,16 +217,11 @@ class AnacondaCallback: elif what in (rpm.RPMCALLBACK_CPIO_ERROR, rpm.RPMCALLBACK_UNPACK_ERROR, rpm.RPMCALLBACK_SCRIPT_ERROR): - if not isinstance(h, types.TupleType): - h = (h, None) - - (hdr, rpmloc) = h - - # If this is a cleanup/remove, then hdr is a string not a header. - if isinstance(hdr, basestring): - name = hdr + # If this is a cleanup/remove, then h is a string not a txmbr + if isinstance(h, basestring): + name = h else: - name = hdr['name'] + name = h.name # Script errors store whether or not they're fatal in "total". So, # we should only error out for fatal script errors or the cpio and @@ -312,6 +294,9 @@ class AnacondaYum(yum.YumBase): # Only needed for media installs. self.mediagrabber = None + # Enable new callback mode + self.use_txmbr_in_callback = True + # Where is the source media mounted? This is the directory # where Packages/ is located. self.tree = "/mnt/source" -- 1.7.4

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel March 2011