Anaconda-devel February 2011

anaconda-devel@lists.fedoraproject.org

21 participants
82 discussions

[PATCH 2/2] Pass --force when calling vgreduce --removemissing. (#679206)
by David Lehman 22 Feb '11

22 Feb '11

--- pyanaconda/storage/devicelibs/lvm.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/storage/devicelibs/lvm.py b/pyanaconda/storage/devicelibs/lvm.py index 31a61a5..121c896 100644 --- a/pyanaconda/storage/devicelibs/lvm.py +++ b/pyanaconda/storage/devicelibs/lvm.py @@ -275,7 +275,7 @@ def vgreduce(vg_name, pv_list, rm=False): args = ["vgreduce"] args.extend(config_args) if rm: - args.extend(["--removemissing", vg_name]) + args.extend(["--removemissing", "--force", vg_name]) else: args.extend([vg_name] + pv_list) -- 1.7.3.4

2 2

[PATCH f15-branch master] Handle nfsiso in promptForNfs as well (#678413).
by Chris Lumens 22 Feb '11

22 Feb '11

The function simply does not know that nfsiso is a thing that can be done so when the source entered in the UI doesn't contain a .treeinfo file, it gives up. Instead, it also needs to try looking for and mounting ISO images. --- loader/nfsinstall.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index 0e8eb08..8c62f8e 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -41,6 +41,7 @@ #include <nm-dhcp4-config.h> #include "copy.h" +#include "dirbrowser.h" #include "loader.h" #include "lang.h" #include "loadermisc.h" @@ -170,6 +171,71 @@ static void addDefaultKickstartFile(char **file, char *ip) { } } +static int ends_with_iso(char *dirname, struct dirent *ent) { + char *suffix; + + if (ent->d_type != DT_REG) + return 0; + + suffix = rindex(ent->d_name, '.'); + return (!strcmp(suffix, "iso")); +} + +static unsigned int isNfsIso(struct loaderData_s *loaderData) { + char **files = NULL; + char *host, *path, *opts, *url; + char *buf; + int rc = 0; + + parseNfsHostPathOpts(loaderData->instRepo, &host, &path, &opts); + checked_asprintf(&url, "%s:%s", host, path); + + if (doPwMount(url, "/mnt/isodir", "auto", opts, NULL)) { + logMessage(ERROR, "couldn't mount %s to look for NFSISO", url); + goto cleanup1; + } + + files = get_file_list("/mnt/isodir", ends_with_iso); + if (!files) { + logMessage(ERROR, "no ISO images present in /mnt/isodir"); + goto cleanup2; + } + + /* mount the first image and check for a .treeinfo file */ + checked_asprintf(&buf, "/mnt/isodir/%s", files[0]); + if (doPwMount(buf, "/tmp/testmnt", "auto", "ro", NULL)) { + logMessage(ERROR, "ISO image %s does not contain a .treeinfo file", files[0]); + goto cleanup3; + } + + if (access("/tmp/testmnt/.treeinfo", R_OK)) { + logMessage(ERROR, ".treeinfo file is not accessible"); + goto cleanup4; + } + + free(loaderData->instRepo); + rc = 1; + + if (opts) { + checked_asprintf(&loaderData->instRepo, "nfsiso:%s:%s:%s", opts, host, path); + } else { + checked_asprintf(&loaderData->instRepo, "nfsiso:%s:%s", host, path); + } + +cleanup4: + umount("/tmp/testmnt"); +cleanup3: + free(buf); +cleanup2: + umount("/mnt/isodir"); +cleanup1: + free(host); + free(path); + free(opts); + free(url); + return rc; +} + int promptForNfs(struct loaderData_s *loaderData) { char *url = NULL; char *host = NULL; @@ -191,7 +257,7 @@ int promptForNfs(struct loaderData_s *loaderData) { checked_asprintf(&url, "%s/.treeinfo", loaderData->instRepo); - if (getFileFromNfs(url, "/tmp/.treeinfo", loaderData)) { + if (getFileFromNfs(url, "/tmp/.treeinfo", loaderData) && !isNfsIso(loaderData)) { newtWinMessage(_("Error"), _("OK"), _("The URL provided does not contain installation media.")); free(url); -- 1.7.1.1

2 2

[PATCH 0/3] Preliminaries for headerless install callback
by Panu Matilainen 22 Feb '11

22 Feb '11

Hi, This patch series removes anaconda's reliance on full rpm headers being available in the install callback. Traditionally yum has used (rpm-header, path) tuple as the "key" for callback to locate the package to-be-installed, but this has the downside of keeping the full rpm headers of all installed packages to be loaded throughout the entire transaction, wasting (tens of) megabytes of memory when it only really needs is nevra info to locate the relevant yum package object. Changing the data yum passes to callback needs to be an opt-in behavior to keep backwards compatibility for users who expect the full header. The details of it are being hashed out currently on yum-devel so it'll need another patch to actually make anaconda use it. In the meanwhile, these patches should be safe to apply already and cause no change of behavior, regardless of what happens in the yum-side of things. Panu Matilainen (3): Remove unused doneFiles counting from transaction callback Test for stringiness instead of explicit rpm.hdr class in install callback Get size + summary from yum package object instead of callback key pyanaconda/yuminstall.py | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) -- 1.7.4

5 13

[rhel6-branch] Fix downloading .treeinfo files for --noverifyssl repos.
by Ales Kozumplik 22 Feb '11

22 Feb '11

Resolves: rhbz#678574 --- yuminstall.py | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index a00d026..3e7f90d 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -682,7 +682,7 @@ class AnacondaYum(YumSorter): c = ConfigParser() # If there's no .treeinfo for this repo, don't bother looking for addons. - treeinfo = self._getTreeinfo(baseurl, repo.proxy_url) + treeinfo = self._getTreeinfo(baseurl, repo.proxy_url, repo.sslverify) if not treeinfo: return retval @@ -707,7 +707,7 @@ class AnacondaYum(YumSorter): return retval - def _getTreeinfo(self, baseurl, proxy_url=None): + def _getTreeinfo(self, baseurl, proxy_url, sslverify): """ Try to get .treeinfo file from baseurl, optionally using proxy_url Saves the file into /tmp/.treeinfo @@ -722,6 +722,11 @@ class AnacondaYum(YumSorter): urlgrabber.grabber.reset_curl_obj() ug = URLGrabber() + ugopts = { + "ssl_verify_peer" : sslverify, + "ssl_verify_host" : sslverify + } + if proxy_url and proxy_url.startswith("http"): proxies = { 'http' : proxy_url, 'https' : proxy_url } @@ -732,7 +737,7 @@ class AnacondaYum(YumSorter): try: ug.urlgrab("%s/.treeinfo" % baseurl, "/tmp/.treeinfo", - copy_local=1, proxies=proxies) + copy_local=1, proxies=proxies, **ugopts) except Exception as e: try: ug.urlgrab("%s/treeinfo" % baseurl, "/tmp/.treeinfo", @@ -751,7 +756,9 @@ class AnacondaYum(YumSorter): """ c = ConfigParser() - treeinfo = self._getTreeinfo(self._baseRepoURL, self.proxy_url) + treeinfo = self._getTreeinfo(self._baseRepoURL, + self.proxy_url, + not flags.noverifyssl) if not treeinfo: return productVersion -- 1.7.3.3

2 1

[PATCH f15-branch master] If the umount in getFileFromNfs fails, log it.
by Chris Lumens 22 Feb '11

22 Feb '11

Related: rhbz#678414 --- loader/nfsinstall.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index ee0465d..0e8eb08 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -396,8 +396,10 @@ int getFileFromNfs(char * url, char * dest, struct loaderData_s * loaderData) { free(path); if (ip) free(ip); - umount("/tmp/mnt"); - unlink("/tmp/mnt"); + if (umount("/tmp/mnt") == -1) + logMessage(ERROR, "could not unmount /tmp/mnt in getFileFromNfs: %s", strerror(errno)); + else + unlink("/tmp/mnt"); return failed; } -- 1.7.1.1

2 1

[PATCH][f15, master] Correct the return values of some backend base class methods. (#679107)
by David Lehman 21 Feb '11

21 Feb '11

--- pyanaconda/backend.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/pyanaconda/backend.py b/pyanaconda/backend.py index b5a7323..965db8e 100644 --- a/pyanaconda/backend.py +++ b/pyanaconda/backend.py @@ -145,6 +145,7 @@ class AnacondaBackend: def groupExists(self, group): log.warning("groupExists not implemented for backend!") + return True def selectGroup(self, group, *args): log.warning("selectGroup not implemented for backend!") @@ -154,6 +155,7 @@ class AnacondaBackend: def packageExists(self, pkg): log.warning("packageExists not implemented for backend!") + return True def selectPackage(self, pkg, *args): log.warning("selectPackage not implemented for backend!") @@ -163,6 +165,7 @@ class AnacondaBackend: def getDefaultGroups(self, anaconda): log.warning("getDefaultGroups not implemented for backend!") + return [] def resetPackageSelections(self): # we just leave this one unimplemented if it's not needed -- 1.7.3.5

3 2

[PATCH] Change xhost auth when doing a liveinst (#663294)
by Brian C. Lane 21 Feb '11

21 Feb '11

If the hostname is changed during a live install it causes X auth problems due to X not running with the -ac flag like a normal install. This turns changes the auth so that a hostname change will not cause problems with X. --- data/liveinst/liveinst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/data/liveinst/liveinst b/data/liveinst/liveinst index 04085ed..f3c9852 100755 --- a/data/liveinst/liveinst +++ b/data/liveinst/liveinst @@ -129,6 +129,9 @@ if [ ! -z "$UPDATES" ]; then export PATH=/tmp/updates:$PATH fi +# Prevents breakage if the hostname is changed during the install +xhost +si:localuser:root + if [ -x /usr/bin/udisks ]; then /usr/bin/udisks --inhibit -- $ANACONDA $* else -- 1.7.4

2 1

[rhel6-branch] Write --noverifyssl to repos and urls in kickstart where fit.
by Ales Kozumplik 21 Feb '11

21 Feb '11

Resolves: rhbz#678576 --- instdata.py | 5 ++++- yuminstall.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/instdata.py b/instdata.py index a0f4997..9f7c166 100644 --- a/instdata.py +++ b/instdata.py @@ -252,7 +252,10 @@ class InstallData: (method, server, dir) = m.split(":") f.write("nfs --server=%s --dir=%s\n" % (server, dir)) elif m.startswith("ftp://") or m.startswith("http"): - f.write("url --url=%s\n" % urllib.unquote(m)) + ssl = "" + if flags.noverifyssl: + ssl = " --noverifyssl" + f.write("url --url=%s%s\n" % (urllib.unquote(m), ssl)) self.instLanguage.writeKS(f) if not self.isHeadless: diff --git a/yuminstall.py b/yuminstall.py index be6796f..a00d026 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1371,7 +1371,7 @@ debuglevel=10 if repo.needsNetwork() and not network.hasActiveNetDev(): if anaconda.intf.enableNetwork(): repo.mirrorlistparsed = False - continue + continue urlgrabber.grabber.reset_curl_obj() @@ -2024,6 +2024,9 @@ debuglevel=10 if repo.exclude: line += " --excludepkgs=\"%s\"" % ",".join(repo.exclude) + if not repo.sslverify: + line += " --noverifyssl" + line += "\n" f.write(line) -- 1.7.3.3

2 1

[lorax] Disable all ctrl-alt-arrow metacity shortcuts.
by Ales Kozumplik 21 Feb '11

21 Feb '11

No need for desktop switching, just makes the users confused. Resolves: rhbz#678892 --- src/pylorax/installtree.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/pylorax/installtree.py b/src/pylorax/installtree.py index 9883bba..5633261 100644 --- a/src/pylorax/installtree.py +++ b/src/pylorax/installtree.py @@ -424,6 +424,14 @@ class LoraxInstallTree(BaseLoraxClass): "string", "disabled"), ("/apps/metacity/global_keybindings/run_command_screenshot", "string", "disabled"), + ("/apps/metacity/global_keybindings/switch_to_workspace_down", + "string", "disabled"), + ("/apps/metacity/global_keybindings/switch_to_workspace_left", + "string", "disabled"), + ("/apps/metacity/global_keybindings/switch_to_workspace_right", + "string", "disabled"), + ("/apps/metacity/global_keybindings/switch_to_workspace_up", + "string", "disabled"), ("/desktop/gnome/interface/accessibility", "bool", "true"), ("/desktop/gnome/interface/at-spi-corba", "bool", "true")] -- 1.7.3.3

2 2

[master] brcm_iscsiuio is not in Fedora yet, handle that you can't find it.
by Ales Kozumplik 21 Feb '11

21 Feb '11

Resolves: rhbz#678675 --- pyanaconda/storage/iscsi.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pyanaconda/storage/iscsi.py b/pyanaconda/storage/iscsi.py index ebaabe5..77be124 100644 --- a/pyanaconda/storage/iscsi.py +++ b/pyanaconda/storage/iscsi.py @@ -193,12 +193,17 @@ class iscsi(object): log.info("iSCSI startup") iutil.execWithRedirect('modprobe', ['-a'] + ISCSI_MODULES, stdout="/dev/tty5", stderr="/dev/tty5") - # this is needed by Broadcom offload cards (bnx2i) - brcm_iscsiuio = iutil.find_program_in_path('brcm_iscsiuio', + # brcm_iscsiuio is needed by Broadcom offload cards (bnx2i). Currently + # not present in iscsi-initiator-utils for Fedora. + try: + brcm_iscsiuio = iutil.find_program_in_path('brcm_iscsiuio', raise_on_error=True) - log.debug("iscsi: brcm_iscsiuio is at %s" % brcm_iscsiuio) - iutil.execWithRedirect(brcm_iscsiuio, [], - stdout="/dev/tty5", stderr="/dev/tty5") + except RuntimeError: + log.info("iscsi: brcm_iscsiuio not found.") + else: + log.debug("iscsi: brcm_iscsiuio is at %s" % brcm_iscsiuio) + iutil.execWithRedirect(brcm_iscsiuio, [], + stdout="/dev/tty5", stderr="/dev/tty5") # run the daemon iutil.execWithRedirect(ISCSID, [], stdout="/dev/tty5", stderr="/dev/tty5") -- 1.7.3.3

2 2

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel February 2011