Anaconda-devel October 2010

anaconda-devel@lists.stg.fedoraproject.org

23 participants
70 discussions

[PATCH 1/2] Improve CheckList class.
by Tomas Mlcoch 18 Nov '10

18 Nov '10

Add Select All/None functionality to header. Add support for titles in header. --- pyanaconda/iw/checklist.py | 27 +++++++++++++++++++++------ pyanaconda/iw/lvm_dialog_gui.py | 3 ++- pyanaconda/iw/partition_ui_helpers_gui.py | 4 +++- pyanaconda/iw/raid_dialog_gui.py | 3 ++- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/pyanaconda/iw/checklist.py b/pyanaconda/iw/checklist.py index 50026a1..304978a 100644 --- a/pyanaconda/iw/checklist.py +++ b/pyanaconda/iw/checklist.py @@ -31,15 +31,16 @@ class CheckList (gtk.TreeView): # override this to make your own columns if necessary def create_columns(self, columns): # add the string columns to the tree view widget - for i in range(1, columns + 1): + titles = [''] + columns + for i in range(1, len(titles)): renderer = gtk.CellRendererText() - column = gtk.TreeViewColumn('Text', renderer, text=i, + column = gtk.TreeViewColumn(titles[i], renderer, text=i, **self.sensitivity_args) column.set_clickable(False) self.append_column(column) # XXX need to handle the multicolumn case better still.... - def __init__ (self, columns = 1, custom_store=None, sensitivity=False): + def __init__ (self, columns = [''], custom_store=None, sensitivity=False): if custom_store is None: self.store = gtk.TreeStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, @@ -50,10 +51,10 @@ class CheckList (gtk.TreeView): gtk.TreeView.__init__ (self, self.store) # XXX we only handle two text columns right now - if custom_store is None and columns > 2: + if custom_store is None and len(columns) > 2: raise RuntimeError, "CheckList supports a maximum of 2 columns" - self.columns = columns + self.columns = len(columns) # sensitivity_col is an optional hidden boolean column that controls # the sensitive property of all of the CellRenderers in its row. @@ -76,6 +77,11 @@ class CheckList (gtk.TreeView): # column.set_fixed_width(40) column.set_clickable(True) self.checkboxrenderer.connect ("toggled", self.toggled_item) + column.connect("clicked", self.select_deselect) + column.set_alignment(0.75) + self.allButton = gtk.ToggleButton() + column.set_widget(self.allButton) + self.allButton.show_all() self.append_column(column) self.create_columns(columns) @@ -88,6 +94,7 @@ class CheckList (gtk.TreeView): # keep track of the number of rows we have so we can # iterate over them all self.num_rows = 0 + self.select_all = True self.tiptext = {} self.props.has_tooltip = True @@ -203,9 +210,17 @@ class CheckList (gtk.TreeView): if col: col.set_sort_column_id(id) + def select_deselect (self, widget, data=None): + """Select/Deselect all checkboxes""" + + self.select_all = not self.select_all + for i in xrange(self.num_rows): + self.set_active(i, self.select_all) + + def main(): win = gtk.Window() - cl = CheckList(1) + cl = CheckList(['Column']) for i in range(1, 10): cl.append_row("%s" %(i,), False, "foo: %d" %(i,)) diff --git a/pyanaconda/iw/lvm_dialog_gui.py b/pyanaconda/iw/lvm_dialog_gui.py index cef3be8..c669f6e 100644 --- a/pyanaconda/iw/lvm_dialog_gui.py +++ b/pyanaconda/iw/lvm_dialog_gui.py @@ -315,7 +315,8 @@ class VolumeGroupEditor: store = gtk.TreeStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_STRING) - partlist = WideCheckList(2, store, self.clickCB) + columns = ['Drive', 'Capacity'] + partlist = WideCheckList(columns, store, self.clickCB) sw = gtk.ScrolledWindow() sw.add(partlist) diff --git a/pyanaconda/iw/partition_ui_helpers_gui.py b/pyanaconda/iw/partition_ui_helpers_gui.py index 08ba44b..ccba7e9 100644 --- a/pyanaconda/iw/partition_ui_helpers_gui.py +++ b/pyanaconda/iw/partition_ui_helpers_gui.py @@ -55,6 +55,7 @@ class WideCheckList(checklist.CheckList): sensitivity=sensitivity) # make checkbox column wider + columns = len(columns) column = self.get_column(columns) self.set_expander_column(column) column = self.get_column(0) @@ -171,7 +172,8 @@ def createAllowedDrivesList(disks, reqdrives, selectDrives=True, disallowDrives= gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) - drivelist = WideCheckList(3, store, sensitivity=True) + columns = ['Drive', 'Capacity', 'Model'] + drivelist = WideCheckList(columns, store, sensitivity=True) createAllowedDrivesStore(disks, reqdrives, drivelist, selectDrives=selectDrives, disallowDrives=disallowDrives) diff --git a/pyanaconda/iw/raid_dialog_gui.py b/pyanaconda/iw/raid_dialog_gui.py index 770344c..3256689 100644 --- a/pyanaconda/iw/raid_dialog_gui.py +++ b/pyanaconda/iw/raid_dialog_gui.py @@ -46,7 +46,8 @@ class RaidEditor: store = gtk.TreeStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_STRING) - partlist = WideCheckList(2, store, + columns = ['Drive', 'Capacity'] + partlist = WideCheckList(columns, store, clickCB=self.raidlist_toggle_callback) sw = gtk.ScrolledWindow() -- 1.7.2.3

3 3

[master] Repository setup and UI patches.
by Radek Vykydal 16 Nov '10

16 Nov '10

data/ui/addrepo.glade | 1 + pyanaconda/__init__.py | 3 +- pyanaconda/backend.py | 9 +- pyanaconda/dispatch.py | 5 +- pyanaconda/gui.py | 2 +- pyanaconda/image.py | 45 -- pyanaconda/installclass.py | 5 +- pyanaconda/iutil.py | 13 + pyanaconda/iw/task_gui.py | 624 ++++++++--------------- pyanaconda/kickstart.py | 8 +- pyanaconda/text.py | 2 +- pyanaconda/textw/task_text.py | 1 - pyanaconda/upgrade.py | 1 + pyanaconda/yuminstall.py | 1112 +++++++++++++++++++++++------------------ 14 files changed, 885 insertions(+), 946 deletions(-) This patchset aims to reorganize our repository editing UI flow so that: - we don't need hacks to reset repos/sacks of YumBase object when going back, rather use new YumBase object see [1] - we can handle some errors during configuration more gracefuly see [2], [3] with screencasts - we can offer a NFSISO (this one is in the patches) and HD for base/installation repo in editing UI quite easily more generally speaking: - the code is more comprehensible, maintainable, and less prone to fallouts rooted in using yum internals in ways not expected by yum (yes, hacks) - base/install repository is handled the same way as other where possible The patchset does not: - change UI layout, I think it needs proper design - abstracts repository/packages source completely, but moves things in this direction The trick is to move tasksel step (repo editing + task selection) before reposetup step and introduce new repocollect step preceeding tasksel in which all repo specifications are collected (from method, ks, dd, /etc/anaconda.repos.d) into objects of new class RepoSpec stored in anaconda.repos list. RepoSpec objects can be used in UI (and elsewhere, e.g. in writeconfig) instead of AnacondaYumRepo (child of YumRepository) objects, using of whose made UI and logic interwined to the point of unmaintenablity. It also alows to remove stuff added into our AnacondaYumRepo (keeping only refernce to RepoSpec there). RepoSpec should go to its own module repos.py as it should be backend independent. For now, I keep it in yuminstall.py together with YumRepoSpec which is inherited from RepoSpec. There is one problem I don't address in this series of patches: The tasksel step/screen combines repo editing and task selection which is unfortunate because task selection requires all repositories to be set. The appropriate steps would be: edit repositories (UI) -> setup repositories (nonUI) -> select tasks (UI), but the first and the third are on the same screen in present UI and threfore I have to call non-UI step from the UI screen which I wasn't able to do without hack. Making task selection a separate step or adding it to group/package selection screen (where it belongs from the yum backend point of view, not sure if also from user point of view) would make things cleaner and allow to avoid the UI flow hacking (see (*) in steps 2) and 3) in "Patched flow" below) You can see in [4] how the repositories are setup after each modification in repo list. Another important change is that all the repository setup (network enablement, mounting, repo setup, sack setup, groups setup) is done in a loop over all enabled RepoSpecs which allows for better handling of errors in UI. Some overwhelming details: Present flow: 1) "reposetup" step - create ayum (YumBackend object) - add AnacondaYumRepo objects for required repos (mehtod, ks repo=, dd) and add them to ayum object - mounting of isos (for cdrom, nfsiso, hdiso) - network enablement if needed - repo setup, sack setup, group setup - editing of invalid repos in dialog - no way to disable repo at this point, in case of fail only Edit/Exit is offered 2) UI "tasksel" step - edit repos - working directly YumRepository objects (the ayum.repos is the only store of repos we have), so all setup from step 1) has to be done here too - select tasks (note that changes in repos can make task selection list obsolete in theory) 3) "basepkgsel" step - group/package selection based on installclass and ks - hacky resetting of groups/sack information needed for going back in UI (from 4, from dialog in 5) 4) UI "group-selection" step - you can go back to 2) 5) "postselection" - create transaction - in case of conflicts you can go back to 4) from a dialog 6) "writeconfig" - write anaconda-ks.cfg using ayum.repos (AnacondaYumRepository objects) Patched flow: 1) "repocollect" step - initialze RepoSpec objects storing specs of required repos (from method, ks, DD, /etc/anaconda.repos.d, addon repos for RHEL) 2) UI "repotasksel" step (formerly "tasksel", keeping its UI layout) - edit repos - works on RepoSpec objects - select tasks - after a repo is edited/enabled/disabled, step 3) has to be called so that task list can be updated 3) "reposetup" step - is skipped if we did it as a part of 2) in UI This could be removed if task selection was separated from repo editing (*) - create ayum (YumBackend object) - for each repo RepoSpec: - enable network if needed - mount repo (nfsiso, hd, cdrom) - add corresponding YumRepository object to ayum - set cache for repository - do repository setup - do sack setup - do group setup if any of the above fails, we know what repo was the cause of fail, store failure info in its RepoSpec object, go back to 2), mark failed repo in the list (see [4]) 4) "basepkgsel" step - group selection based on installclass and ks - no reset on the way back is needed as in UI step 2), we start with new ayum object 5) UI "group-selection" - you can go back to 2) 6) "postselection" - create transaction - in case of conflicts you can go back to 5) from a dialog 7) "writeconfig" - write anaconda-ks.cfg using anaconda.repos (RepoSpec objects) [1] https://bugzilla.redhat.com/show_bug.cgi?id=622376#c5 screencasts: - the bug: http://rvykydal.fedorapeople.org/repoUI/example3.ogg - fixed with patches: http://rvykydal.fedorapeople.org/repoUI/example3patched.ogg [2] if failing nfs repo= is used in kickstart - choosing Continue lead to fatal fail: http://rvykydal.fedorapeople.org/repoUI/example1.ogg - choosing Edit and Cancel lead to fatal fail: http://rvykydal.fedorapeople.org/repoUI/example1b.ogg ... also the true cause (nfs mount error) is hidden - with the patch [Edit] means going to repo UI screen where the failing repo can be disabled: http://rvykydal.fedorapeople.org/repoUI/example1patched.ogg [3] network requiring repository set by boot param repo=, no network needed till repository steps - failing to enable network for base repository is fatal: http://rvykydal.fedorapeople.org/repoUI/example3.ogg - with patch, you can fall back to media (non network) repo: http://rvykydal.fedorapeople.org/repoUI/example3patched.ogg [4] http://rvykydal.fedorapeople.org/repoUI/example.ogg

2 12

[master 1/3] Simplify the way we hook to the iscsi kickstart command parsing.
by Ales Kozumplik 01 Nov '10

01 Nov '10

more precisely: override execute() of the command or data, not parse(). --- pyanaconda/kickstart.py | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index bc1d8b6..7e5480c 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -382,25 +382,21 @@ class IgnoreDisk(commands.ignoredisk.RHEL6_IgnoreDisk): if not self.interactive: anaconda.ksdata.skipSteps.extend(["filter", "filtertype"]) -class Iscsi(commands.iscsi.F10_Iscsi): - def parse(self, args): - tg = commands.iscsi.F10_Iscsi.parse(self, args) - +class IscsiData(commands.iscsi.F10_IscsiData): + def execute(self, anaconda): try: - storage.iscsi.iscsi().addTarget(tg.ipaddr, tg.port, - tg.user, tg.password, tg.user_in, tg.password_in) - log.info("added iscsi target: %s" %(tg.ipaddr,)) + storage.iscsi.iscsi().addTarget(self.ipaddr, self.port, + self.user, self.password, + self.user_in, self.password_in, + anaconda.intf) + log.info("added iscsi target: %s" %(self.ipaddr,)) except (IOError, ValueError), e: raise KickstartValueError, formatErrorMsg(self.lineno, msg=str(e)) - return tg class IscsiName(commands.iscsiname.FC6_IscsiName): - def parse(self, args): - retval = commands.iscsiname.FC6_IscsiName.parse(self, args) - + def execute(self, anaconda): storage.iscsi.iscsi().initiator = self.iscsiname - return retval class Keyboard(commands.keyboard.FC3_Keyboard): def execute(self, anaconda): @@ -1092,7 +1088,6 @@ commandMap = { "halt": Reboot, "ignoredisk": IgnoreDisk, "install": Upgrade, - "iscsi": Iscsi, "iscsiname": IscsiName, "keyboard": Keyboard, "lang": Lang, @@ -1111,6 +1106,7 @@ commandMap = { } dataMap = { + "IscsiData" : IscsiData, "LogVolData": LogVolData, "NetworkData": NetworkData, "PartData": PartitionData, -- 1.7.1.1

2 11

[PATCH] Errors downloading .treeinfo files should not be logged as errors.
by Chris Lumens 28 Oct '10

28 Oct '10

At least in Fedora, there won't be a .treeinfo file at the mirror manager URL. So when we attempt to fetch the addon list, it'll look like there is a real problem when it's an expected situation. Log appropriately. --- pyanaconda/yuminstall.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index 54afb10..4ceafcc 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -729,7 +729,7 @@ class AnacondaYum(YumSorter): copy_local=1, proxies=proxies) return "/tmp/.treeinfo" except Exception as e: - log.error("Error downloading %s/.treeinfo: %s" % (baseurl, e)) + log.info("Error downloading %s/.treeinfo: %s" % (baseurl, e)) return None def _getReleasever(self): -- 1.7.1.1

1 0

RE: [PATCH] - get rid of split media
by David Cantrell 28 Oct '10

28 Oct '10

On Thu, 28 Oct 2010, Moray Henderson wrote: > David Cantrell wrote: >> We could also consider creating install images designed for use on > large >> capacity USB flash drives. A 32GB flash drive can hold the entire >> distribution and work as an installation source. Boot and install from > it >> or just use it as the package repo. > > Very useful at a single site, or for a technician to carry when visiting > sites. Not so good when distributing media to many remote sites (32GB > flash drive - £37.00. DVD+RW - £0.32. Competent System Administrator - > priceless :-) ) Sure, that's the price now. And 32GB was an arbitrary number, the actual requirement would probably be smaller. My point was that we have other install methods that can pretty much fill the need that split media was doing. -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI

1 0

[PATCH] - get rid of split media
by Chris Lumens 28 Oct '10

28 Oct '10

This series gets rid of split media. It gets rid of the media number from the .discinfo files. It gets rid of the code around media check for checking multiple images. It reduces the amount of silly crap we've got in yuminstall.py. - Chris

11 33

[PATCH] Log which step we're on in doLoaderMain.
by Chris Lumens 28 Oct '10

28 Oct '10

--- loader/loader.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 2836593..f9d5483 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1236,6 +1236,9 @@ static void doLoaderMain(struct loaderData_s *loaderData, enum { STEP_LANG, STEP_KBD, STEP_METHOD, STEP_DRIVER, STEP_DRIVERDISK, STEP_NETWORK, STEP_IFACE, STEP_IP, STEP_EXTRAS, STEP_DONE } step; + char *step_names[] = { "STEP_LANG", "STEP_KBD", "STEP_METHOD", "STEP_DRIVER", + "STEP_DRIVERDISK", "STEP_NETWORK", "STEP_IFACE", + "STEP_IP", "STEP_EXTRAS", "STEP_DONE" }; char *ret = NULL, *devName = NULL, *kbdtype = NULL; static iface_t iface; @@ -1267,6 +1270,8 @@ static void doLoaderMain(struct loaderData_s *loaderData, } while (step != STEP_DONE) { + logMessage(DEBUGLVL, "in doLoaderMain, step = %s", step_names[step]); + switch(step) { case STEP_LANG: { if (loaderData->lang && (loaderData->lang_set == 1)) @@ -1462,8 +1467,6 @@ static void doLoaderMain(struct loaderData_s *loaderData, } case STEP_IFACE: { - logMessage(INFO, "going to pick interface"); - /* skip configureTCPIP() screen for kickstart (#260621) */ if (loaderData->ksFile) flags |= LOADER_FLAGS_IS_KICKSTART; -- 1.7.1.1

1 0

[PATCH] On upgrades, inform the user what action is taking place (#493249).
by Chris Lumens 28 Oct '10

28 Oct '10

rpm doesn't tell the callback very much on upgrade cleanups. We don't know how many packages it's going to deal with. We don't know the size of the package being cleaned up. We certainly don't know how long it's going to take. About the only thing we do know is what package is being processed. --- pyanaconda/yuminstall.py | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index b52f37c..34ea792 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -229,14 +229,9 @@ class AnacondaCallback: self.inProgressPo = None - elif what in (rpm.RPMCALLBACK_UNINST_START, - rpm.RPMCALLBACK_UNINST_STOP): - if self.initWindow is None: - self.initWindow = self.pulseWindow(_("Finishing upgrade"), - _("Finishing upgrade process. This may take a little while."), - 0, pulse=True) - else: - self.initWindow.pulse() + elif what == rpm.RPMCALLBACK_UNINST_START: + self.progress.set_text("") + self.progress.set_label(_("<b>Cleaning up %s</b>" % h)) elif what in (rpm.RPMCALLBACK_CPIO_ERROR, rpm.RPMCALLBACK_UNPACK_ERROR, -- 1.7.1.1

1 0

Re: [PATCH] - get rid of split media
by John Reiser 28 Oct '10

28 Oct '10

On 10/28/2010 01:50 AM, Moray Henderson wrote: > This could bite upgrades. Last year I had to put together upgrades from > CentOS-4-based systems to CentOS-5-based, using CDs not DVD or network. > [snip] The only way I could reduce the upgrade to a single CD [snip] It is easy to boot from CD to the GRUB screen, edit the kernel command line parameter "root=" to point to a USB drive which will be recognized by the to-be-booted kernel, and then run anaconda (or any system) from USB, even USB1.1. I use this to run an old laptop (which boots only from CD or harddrive) using no battery-draining moving parts after boot, treating an 8 GB USB2.0 flash memory drive as a "solid state disk." --

1 0

CD vs DVD install problem
by Moray Henderson 28 Oct '10

28 Oct '10

On the subject of split media, I have a CentOS-5-based install tree created by buildinstall. Running splittree on it produces the set of CD images which work perfectly. However if I make an iso from the full install tree and burn it to DVD, it installs all the packages correctly but fails to install the bootloader. I need to boot from the DVD again and use rescue mode to run grub manually. Have I missed a step in making the DVD? Moray. "To err is human. To purr, feline"

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel October 2010