Anaconda-devel July 2010

anaconda-devel@lists.fedoraproject.org

20 participants
65 discussions

[PATCH rhel6-branch] Reset resolver after network device activation (#614001)
by Radek Vykydal 15 Jul '10

15 Jul '10

We need to reset resolver using our isys.resetResolver in rhel6 because curl is built without support for c-ares. If/when curl supporting c-ares is pulled into rhel6, urlgrabber.reset_curl_obj() call will be needed for resetting, so I also add the call to some places where it is missing. --- iw/advanced_storage.py | 2 ++ iw/task_gui.py | 2 ++ kickstart.py | 1 + network.py | 12 ++++++++---- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/iw/advanced_storage.py b/iw/advanced_storage.py index 79af83c..38ed181 100644 --- a/iw/advanced_storage.py +++ b/iw/advanced_storage.py @@ -27,6 +27,7 @@ import iutil import network import storage.fcoe import storage.iscsi +import urlgrabber.grabber def addFcoeDrive(anaconda): (dxml, dialog) = gui.getGladeWidget("fcoe-config.glade", "fcoeDialog") @@ -104,6 +105,7 @@ def addIscsiDrive(anaconda): if not network.hasActiveNetDev(): if not anaconda.intf.enableNetwork(): return gtk.RESPONSE_CANCEL + urlgrabber.grabber.reset_curl_obj() (dxml, dialog) = gui.getGladeWidget("iscsi-config.glade", "iscsiDialog") gui.addFrame(dialog) diff --git a/iw/task_gui.py b/iw/task_gui.py index 6330b2b..5bce75c 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -45,6 +45,7 @@ def setupRepo(anaconda, repo): if repo.needsNetwork() and not network.hasActiveNetDev(): if not anaconda.intf.enableNetwork(): return False + urlgrabber.grabber.reset_curl_obj() try: anaconda.backend.doRepoSetup(anaconda, thisrepo=repo.id, fatalerrors=False) anaconda.backend.doSackSetup(anaconda, thisrepo=repo.id, fatalerrors=False) @@ -309,6 +310,7 @@ class RepoEditor: "networking, but there was an error enabling the " "network on your system.")) return False + urlgrabber.grabber.reset_curl_obj() import tempfile dest = tempfile.mkdtemp("", repo.name.replace(" ", ""), "/mnt") diff --git a/kickstart.py b/kickstart.py index 07f4073..2041686 100644 --- a/kickstart.py +++ b/kickstart.py @@ -154,6 +154,7 @@ def getEscrowCertificate(anaconda, url): custom_icon="error", custom_buttons=[_("_Exit installer")]) sys.exit(1) + urlgrabber.grabber.reset_curl_obj() log.info("escrow: downloading %s" % (url,)) diff --git a/network.py b/network.py index f3cb5e7..57e618a 100644 --- a/network.py +++ b/network.py @@ -726,18 +726,22 @@ class Network: waited_devs_props[iface] = device_props_iface i = 0 + reset_resolver = False while True: for dev, device_props_iface in waited_devs_props.items(): state = device_props_iface.Get(isys.NM_DEVICE_IFACE, "State") if state == isys.NM_DEVICE_STATE_ACTIVATED: waited_devs_props.pop(dev) - if len(waited_devs_props) == 0: - return [] - if i >= CONNECTION_TIMEOUT: - return waited_devs_props.keys() + reset_resolver = True + if len(waited_devs_props) == 0 or i >= CONNECTION_TIMEOUT: + break i += 1 time.sleep(1) + if reset_resolver: + isys.resetResolv() + return waited_devs_props.keys() + # write out current configuration state and wait for NetworkManager # to bring the device up, watch NM state and return to the caller # once we have a state -- 1.6.0.6

2 1

Firstboot create user password checking
by Martin Gracik 15 Jul '10

15 Jul '10

Hello, I did this little password strength warning thing in firstboot's create user screen. You can see the video how it looks here http://mgracik.fedorapeople.org/create_user.ogg To be consistent I would like to put it to anaconda root user password screen too, instead of the dialog box warning. Let me know what you guys think. Thanks. -- Martin Gracik

5 6

[PATCH] Add the gobject-introspection package (#613695)
by Martin Gracik 14 Jul '10

14 Jul '10

Also don't remove the needed libraries from libdir, when creating the install.img. --- scripts/upd-instroot | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 6b6c0d4..f3311f8 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -168,7 +168,7 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda elfutils-libelf expat fcoe-utils firstboot fontconfig fonts-ISO8859-2 freetype gail gawk gdb-gdbserver gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf - gnome-themes gpm grep gtk2 gtk2-engines + gnome-themes gobject-introspection gpm grep gtk2 gtk2-engines hdparm hwdata initscripts iproute iputils iscsi-initiator-utils jfsutils kbd kpartx keyutils-libs krb5-libs libICE libSM libX11 libXau libXaw libXcursor libXdmcp libXevie libXext libXfixes libXfont libXft @@ -502,6 +502,7 @@ usr/$LIBDIR/gconv usr/$LIBDIR/gdk-pixbuf/loaders/*la* usr/$LIBDIR/gdk-pixbuf/loaders/*png* usr/$LIBDIR/gdk-pixbuf/loaders/*xpm* +usr/$LIBDIR/girepository-1.0 usr/$LIBDIR/gtk-2.0/*/engines/libclearlooks.so usr/$LIBDIR/gtk-2.0/*/loaders/*la* usr/$LIBDIR/gtk-2.0/*/loaders/*png* -- 1.7.1.1

2 1

[RHEL6-branch] Use blacklist_exceptions for mpath devices (#612399)
by Peter Jones 14 Jul '10

14 Jul '10

From: NEC <mfuruta(a)redhat.com> This makes anaconda generate a blacklist_exceptions section in multipath.conf --- storage/devicelibs/mpath.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/storage/devicelibs/mpath.py b/storage/devicelibs/mpath.py index 50cccfd..ae7b257 100644 --- a/storage/devicelibs/mpath.py +++ b/storage/devicelibs/mpath.py @@ -232,6 +232,14 @@ blacklist { ret += '\t\tvendor %s\n' % device.vendor ret += '\t\tproduct %s\n' % device.model ret += '\t}\n' + if self.mpaths: + ret += '\twwid "*"\n' + ret += '}\n' + ret += 'blacklist_exceptions {\n' + for mpath in self.mpaths: + for k,v in mpath.config.items(): + if k == 'wwid': + ret += '\twwid %s\n' % v ret += '}\n' ret += 'multipaths {\n' for mpath in self.mpaths: -- 1.7.1.1

3 4

[RHEL6-branch] Revert "Skip the bootloader placement window if we're on UEFI (#582143)"
by Peter Jones 13 Jul '10

13 Jul '10

This reverts commit cc260f65afe03fb8ab690ea20f0a17b24a3c808e. We need to show part of the screen, but not other parts. --- installclass.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/installclass.py b/installclass.py index 236f778..deb7e53 100644 --- a/installclass.py +++ b/installclass.py @@ -129,7 +129,7 @@ class BaseInstallClass(object): if not BETANAG: dispatch.skipStep("betanag", permanent=1) - if iutil.isEfi() or not iutil.isX86(): + if not iutil.isX86(): dispatch.skipStep("bootloader", permanent=1) # allow backends to disable interactive package selection -- 1.7.1.1

2 1

[PATCH rhel6-branch master] Don't crash when putting mpath devices into the filter name cache (#597223).
by Chris Lumens 13 Jul '10

13 Jul '10

The big problem here is that identifyMultipaths returns a list of lists of components, whereas the name cache stuff expects just a regular list. Therefore, I need to first flatten the component structure when creating the cache and also check every component of an mpath device to see if it's in the cache before deciding a device is new or not. --- iw/filter_gui.py | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/iw/filter_gui.py b/iw/filter_gui.py index 4552491..50346c9 100644 --- a/iw/filter_gui.py +++ b/iw/filter_gui.py @@ -23,6 +23,7 @@ import collections import gtk, gobject import gtk.glade import gui +import itertools import iutil import parted import _ped @@ -445,9 +446,20 @@ class FilterWindow(InstallWindow): new_singlepaths) nonraids = filter(lambda d: d not in self._cachedDevices, new_nonraids) - mpaths = filter(lambda d: d not in self._cachedMPaths, new_mpaths) raids = filter(lambda d: d not in self._cachedRaidDevices, new_raids) + # The end result of the loop below is that mpaths is a list of lists of + # components, just like new_mpaths. That's what populate expects. + mpaths = [] + for mp in new_mpaths: + for d in mp: + # If all components of this multipath device are in the + # cache, skip it. Otherwise, it's a new device and needs to + # be populated into the UI. + if d not in self._cachedMPaths: + mpaths.append(mp) + break + self.populate(nonraids, mpaths, raids, activeByDefault=True) # Make sure to update the size label at the bottom. @@ -457,6 +469,11 @@ class FilterWindow(InstallWindow): self._cachedMPaths.extend(mpaths) self._cachedRaidDevices.extend(raids) + # And then we need to do the same list flattening trick here as in + # getScreen. + lst = list(itertools.chain(*mpaths)) + self._cachedMPaths.extend(lst) + def _makeBasic(self): np = NotebookPage(self.store, "basic", self.xml, Callbacks(self.xml)) @@ -610,9 +627,15 @@ class FilterWindow(InstallWindow): # can just add the new devices to the UI. This is going to be slow, # but the user has to click a button to get to the slow part. self._cachedDevices = NameCache(singlepaths) - self._cachedMPaths = NameCache(mpaths) self._cachedRaidDevices = NameCache(raids) + # Multipath is a little more complicated. Since mpaths is a list of + # lists, we can't directly store that into the cache. Instead we want + # to flatten it into a single list of all components of all multipaths + # and store that. + lst = list(itertools.chain(*mpaths)) + self._cachedMPaths = NameCache(lst) + # Switch to the first notebook page that displays any devices. i = 0 for pg in self.pages: -- 1.7.0.1

3 2

[PATCH rhel6-branch master 1/2] Enforce the same logic on autopart shrink as on resize (#608172)
by Brian C. Lane 12 Jul '10

12 Jul '10

The shrink dialog is presenting different values than resize in the partition editor. Use the same logic for both. As a result, it won't allow you to shrink a partition if it cannot find its proper minimum size. Related: rhbz#608172 --- iw/autopart_type.py | 3 +-- iw/partition_ui_helpers_gui.py | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/iw/autopart_type.py b/iw/autopart_type.py index 7436751..36d4e6c 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -45,8 +45,7 @@ def whichToShrink(storage, intf): newSize = shrinkSB.get_value_as_int() part = getActive(combo) - reqlower = long(math.ceil(part.format.minSize)) - requpper = long(math.floor(part.format.currentSize)) + (reqlower, requpper) = getResizeMinMax( part ) adj = shrinkSB.get_adjustment() adj.lower = max(1,reqlower) diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index 8fa5f6f..34e4524 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -26,6 +26,7 @@ import gtk import checklist import datacombo import iutil +import math from constants import * from partIntfHelpers import * @@ -378,16 +379,7 @@ def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo, else: value = origrequest.size - reqlower = 1 - requpper = origrequest.maxSize - - if origfs.exists: - reqlower = origrequest.minSize - - if origrequest.type == "partition": - geomsize = origrequest.partedPartition.geometry.getSize(unit="MB") - if (geomsize != 0) and (requpper > geomsize): - requpper = geomsize + (reqlower, requpper) = getResizeMinMax( origrequest ) adj = gtk.Adjustment(value = value, lower = reqlower, upper = requpper, step_incr = 1) @@ -435,3 +427,18 @@ def doUIRAIDLVMChecks(format, req_disks, storage): "drive in the 'Allowable Drives' checklist.") % format.name) +def getResizeMinMax( part ): + """ Return the minimum/maximum size for a selected partition + + Assumes that it is resizable and that it exists. + """ + reqlower = long(math.ceil(part.minSize)) + requpper = long(math.floor(part.maxSize)) + + if part.type == "partition": + geomsize = part.partedPartition.geometry.getSize(unit="MB") + if (geomsize != 0) and (requpper > geomsize): + requpper =long(math.floor(geomsize)) + + return(reqlower, requpper) + -- 1.7.1.1

3 5

Anaconda Redesign
by Kennedy Kasina 09 Jul '10

09 Jul '10

Hi Fellow Developers, Let me start by introducing myself. My names are Kennedy Kasina, a developer based in Kenya. I joined the Fedora project barely a month ago. I have been involved in other opensource projects as well. I wanted to make a contribution to Anaconda. I have been working on some redesign. Please find attached a screenshot of the "addrepo" dialog. I'm still working on the other parts. Kindly let me know your thought about it. Regards, Kennedy Kasina

2 2

[master] add mime.cache to the stage2 image (#609596).
by Ales Kozumplik 08 Jul '10

08 Jul '10

needed by gtk.gdk.pixbuf_new_from_file() when opening a file. this is due to the recent updates to the gtk2 library. --- scripts/upd-instroot | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index f0d9f6e..6b6c0d4 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -194,7 +194,8 @@ PACKAGES="GConf2 NetworkManager NetworkManager-gnome ORBit2 acl anaconda python-urlgrabber python-volume_key pyxf86config readline redhat-artwork reiserfs-utils report-config-default report-gtk report-newt rpm rpm-libs rpm-python rsyslog sed selinux-policy-targeted - setup slang smc-meera-fonts specspo sqlite startup-notification strace + setup slang shared-mime-info smc-meera-fonts + specspo sqlite startup-notification strace synaptics system-config-date system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release sysvinit-tools taipeifonts tcp_wrappers tcp_wrappers-libs telnet @@ -684,6 +685,7 @@ usr/share/locale/*/LC_MESSAGES/system-config-date.mo usr/share/locale/*/LC_MESSAGES/system-config-keyboard.mo usr/share/locale/*/LC_MESSAGES/zenity.mo usr/share/locale/locale.alias +usr/share/mime/mime.cache usr/share/nm-applet/* usr/share/pixmaps/comps/*.png usr/share/pixmaps/gnome-default-dlg.png -- 1.7.1

2 1

[master] makeupdates: treat files under pyanaconda/ individually.
by Ales Kozumplik 08 Jul '10

08 Jul '10

instead of just copying over the entire pyanaconda/. we can afford doing this now for two reasons: 1) anaconda:setupPythonUpdates() symlinks remaining files and directories. 2) booty/ and isys/ are now correctly under pyanaconda. --- scripts/makeupdates | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/scripts/makeupdates b/scripts/makeupdates index b91e785..8279e28 100755 --- a/scripts/makeupdates +++ b/scripts/makeupdates @@ -121,27 +121,22 @@ def copyUpdatedFiles(tag, updates, cwd): file.endswith('.sh') or file == 'configure.ac': continue - if file.find('/') != -1: + if file.startswith('pyanaconda/'): + sys.stdout.write("Including %s\n" % (file,)) + update_filename = os.path.realpath(os.path.join(updates, file)) + update_dir = os.path.dirname(update_filename) + if not os.path.isdir(update_dir): + os.makedirs(update_dir) + shutil.copy2(file, update_dir) + elif file.find('/') != -1: fields = file.split('/') subdir = fields[0] - - if subdir in ['booty', 'isys', 'pyanaconda']: - subupdates = os.path.realpath(updates + '/' + subdir) - if os.path.isdir(subupdates): - shutil.rmtree(subupdates) - - if not subdir in subdirs: - sys.stdout.write("Including %s/\n" % (subdir,)) - subdirs.append(subdir) - - shutil.copytree(os.path.realpath(cwd + '/' + subdir), - subupdates, ignore=pruneFile) - elif subdir == 'loader' or subdir == 'po' or \ - subdir =='scripts' or subdir == 'command-stubs' or \ - subdir == 'tests' or subdir == 'bootdisk' or \ - subdir == 'docs' or subdir == 'fonts' or \ - subdir == 'utils' or subdir == 'gptsync' or \ - subdir == 'liveinst': + if subdir == 'loader' or subdir == 'po' or \ + subdir =='scripts' or subdir == 'command-stubs' or \ + subdir == 'tests' or subdir == 'bootdisk' or \ + subdir == 'docs' or subdir == 'fonts' or \ + subdir == 'utils' or subdir == 'gptsync' or \ + subdir == 'liveinst': continue else: sys.stdout.write("Including %s\n" % (file,)) -- 1.7.1

2 2

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 July 2010