Anaconda-devel April 2010

anaconda-devel@lists.stg.fedoraproject.org

21 participants
115 discussions

[PATCH] Check for the real device-mapper nodes in /proc/swaps. (#567840)
by David Lehman 11 May '10

11 May '10

--- storage/devicelibs/swap.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/storage/devicelibs/swap.py b/storage/devicelibs/swap.py index d037d80..02a07d4 100644 --- a/storage/devicelibs/swap.py +++ b/storage/devicelibs/swap.py @@ -26,6 +26,7 @@ import iutil import os from ..errors import * +from . import dm import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -100,13 +101,20 @@ def swapoff(device): raise SwapError("swapoff failed for '%s'" % device) def swapstatus(device): + alt_dev = device + if device.startswith("/dev/mapper/"): + # get the real device node for device-mapper devices since the ones + # with meaningful names are just symlinks + alt_dev = "/dev/%s" % dm.dm_node_from_name(device.split("/")[-1]) + lines = open("/proc/swaps").readlines() status = False for line in lines: if not line.strip(): continue - - if line.split()[0] == device: + + swap_dev = line.split()[0] + if swap_dev in [device, alt_dev]: status = True break -- 1.6.6

3 4

nm-c-e enablement and stage 2 wireless support
by Radek Vykydal 06 May '10

06 May '10

This patches make nm-c-e usable (1), and actually used for network enablement (2), and also add support for wireless into stage2 (3). (1) When nm-c-e was invoked, it didn't contain any devices that were not enabled in stage 1 - we have to set NM_CONTROLLED so that nm-c-e sees the devices. (2) Stage 2 Enable Network dialog was removed and nm-c-e is used instead - same as for network configuration using [Configure Network] button (see gui.py enableNetwork function, patch [9/22]). Before invoking nm-c-e for enablement (not just for configuration), user is asked which device to use (combo as in old enable network dialog) and he can also uncheck devices that he doesn't want to be controlled by NM (the latter applies also for network configuration). This introduces ipv6 support in stage2 (gui). These two (patches with #520146 in commit message) are both for master and rhel6-branch. (3) Wireless support for stage 2 was added - if there are wireless devices, user is also asked to choose AP before running nm-c-e (and ESSID ifcfg value is updated). Patches [16/22], [22/22] This is for master. nm-c-e use for stage2 network configuration (and enablement) resulted in tighter linking of NetworkDevice objects with device's ifcfg file because ifcfg files seems to be the way we need to communicate with nm-c-e (pass values to nm-c-e) The patches was tested for 2 wired net cards, and for one wired + one wireless, I used anaconda 14.1 for testing, patches I sent are applicable to master. TODO: - I added also some todo/discutable patches [17-22/22] for considering. - I still need to do kickstart testing. - Test handling of keys files for wireless, I need a testing machine with wireless where I could do complete install (not my ntb that I am using now;) - New dialogs need polishing. Radek

4 64

nm-c-e enablement and stage 2 wireless support
by Radek Vykydal 06 May '10

06 May '10

Adds 3 patches to 22 patches of the first bunch, addressing some TODOs (still concerning stage 2 only). - wireless keys handling - makes kickstart wepkey= and essid work - wireless keys copying to system and clean-up of copying of configuration from anaconda environment to system Radek

3 10

2 patches on ReviewBoard
by David Cantrell 03 May '10

03 May '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Yesterday I posted some patches for review on ReviewBoard. Since the email notices are not currently set up, I'm sending this out. Thanks, - -- David Cantrell <dcantrell(a)redhat.com> Red Hat / Honolulu, HI -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvbPT0ACgkQ5hsjjIy1VkmrDwCg4AsEWn1Wdf8rDJ90hNNfHL3Q G3sAoPlK4cbbq4XQN+i6dfZB0hafMwnd =0Trr -----END PGP SIGNATURE-----

4 6

[PATCH] Default the global grub timeout to 5 for serial
by Jesse Keating 03 May '10

03 May '10

Just setting the terminal timeout doesn't seem to be enough. This sets the global time out if serial is in use. Resolves #568106 --- booty/x86.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/booty/x86.py b/booty/x86.py index 14bd641..89d6393 100644 --- a/booty/x86.py +++ b/booty/x86.py @@ -278,9 +278,10 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write('default=%s\n' % (default)) - f.write('timeout=%d\n' % (self.timeout or 0)) if self.serial == 1: + # Set the global timeout in serial case + f.write('timeout=%d\n' % (self.timeout or 5)) # grub the 0-based number of the serial console device unit = self.serialDevice[-1] @@ -299,6 +300,8 @@ class x86BootloaderInfo(efiBootloaderInfo): f.write("serial --unit=%s --speed=%s\n" %(unit, speed)) f.write("terminal --timeout=%s serial console\n" % (self.timeout or 5)) else: + # Default to 0 timeout in the non-serial case + f.write('timeout=%d\n' % (self.timeout or 0)) # we only want splashimage if they're not using a serial console if os.access("%s/boot/grub/splash.xpm.gz" %(instRoot,), os.R_OK): f.write('splashimage=%s%sgrub/splash.xpm.gz\n' -- 1.7.0.1

3 2

[PATCH rhel6-branch 1/3] Add a method that fetches and returns the .treeinfo file.
by Chris Lumens 03 May '10

03 May '10

--- yuminstall.py | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/yuminstall.py b/yuminstall.py index 858fe0a..05a3b69 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -589,6 +589,18 @@ class AnacondaYum(YumSorter): return repo + def _getTreeinfo(self): + if os.access("%s/.treeinfo" % self.anaconda.methodstr, os.R_OK): + return "%s/.treeinfo" % self.anaconda.methodstr + else: + try: + ug = URLGrabber() + ug.urlgrab("%s/.treeinfo" % self.anaconda.methodstr, + "/tmp/.treeinfo", copy_local=1) + return "/tmp/.treeinfo" + except: + return None + # We need to make sure $releasever gets set up before .repo files are # read. Since there's no redhat-release package in /mnt/sysimage (and # won't be for quite a while), we need to do our own substutition. @@ -596,15 +608,12 @@ class AnacondaYum(YumSorter): from ConfigParser import ConfigParser c = ConfigParser() - try: - if os.access("%s/.treeinfo" % self.anaconda.methodstr, os.R_OK): - ConfigParser.read(c, "%s/.treeinfo" % self.anaconda.methodstr) - else: - ug = URLGrabber() - ug.urlgrab("%s/.treeinfo" % self.anaconda.methodstr, - "/tmp/.treeinfo", copy_local=1) - ConfigParser.read(c, "/tmp/.treeinfo") + treeinfo = self._getTreeinfo() + if not treeinfo: + return productVersion + ConfigParser.read(c, treeinfo) + try: return c.get("general", "version") except: return productVersion -- 1.7.0.1

3 12

double module loads
by Ales Kozumplik 03 May '10

03 May '10

Hi Chris, list, I think the whole 'pyanaconda' change had one side effect we didn't expect: modules can be imported and initialized twice now. The sys.path now contains both: site-packages site-packages/pyanaconda The first one is the default and allows us to do things like from pyanaconda import Anaconda which we almost never do. The second one allows us to do the classical short: import kickstart The problem is when you do import module and later: from pyanaconda import module For python, the two modules seem to be a different module and so it loads them twice (and adds them as two separate entries into sys.modules, once as 'module', then as 'pyanaconda.module'). The module init code that we expect to be executed exactly once is then executed twice. I found out about this thing by noticing that all the logging output is doubled after certain execution point (due to handlers being added twice). Another complication is with updates: if a module is first imported from your update directory but later from site-packages/pyanaconda, it actually runs a different code--->total chaos. I spend the morning looking at this and here's what we could do: 1) Replace all imports to be from pyanaconda. instead of: import kickstart one would write: from pyanaconda import kickstart Big and tedious change. 2) have import hooks that make sure everything is imported only once. Attempt to load an already imported module will produce a mere entry/reference copy in sys.modules. I prefer this solution, it allows us to gradually migrate to (1) and then get rid of it. 3) Remove all the offending from pyanaconda import .. lines and only use the old import style. This means the problem is going to bite us later (or it's going to bite someone who imports anaconda modules and then us). Ales

3 3

[PATCH] - change our default partitioning scheme
by Chris Lumens 30 Apr '10

30 Apr '10

Here's a patch series that ends up with creating a /home by default. The algorithm is basically: - VG < 50 GB: make /boot, swap, rest as / - VG >= 50 GB: make /boot, swap, / with a 50 GB max, rest as /home Let the arguing begin. - Chris

11 26

[PATCH] Add all possible install class locations to the search path (#587696).
by Chris Lumens 30 Apr '10

30 Apr '10

RHEL6 install classes inherit from each other. In order for anaconda to import a subclass, it's going to have to have the location of the subclass in the path too. Also, fix the base RHEL install class's name so we don't get an import error. --- installclass.py | 21 +++++++++++---------- installclasses/rhel.py | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/installclass.py b/installclass.py index 6756405..deb7e53 100644 --- a/installclass.py +++ b/installclass.py @@ -245,20 +245,21 @@ def availableClasses(showHidden=0): else: if allClasses_hidden: return allClasses_hidden - if os.access("installclasses", os.R_OK): - path = "installclasses" - elif os.access("/tmp/updates/installclasses", os.R_OK): - path = "/tmp/updates/installclasses" - elif os.access("/tmp/product/installclasses", os.R_OK): - path = "/tmp/product/installclasses" - else: - path = "/usr/lib/anaconda/installclasses" + path = [] + + for dir in ["installclasses", "/tmp/updates/installclasses", + "/tmp/product/installclasses", "/usr/lib/anaconda/installclasses"]: + if os.access(dir, os.R_OK): + path.append(dir) # append the location of installclasses to the python path so we # can import them - sys.path.insert(0, path) + sys.path = path + sys.path + + files = [] + for p in reversed(path): + files += os.listdir(p) - files = os.listdir(path) done = {} list = [] for file in files: diff --git a/installclasses/rhel.py b/installclasses/rhel.py index 7aaf356..46dfca8 100644 --- a/installclasses/rhel.py +++ b/installclasses/rhel.py @@ -27,7 +27,7 @@ import types import installmethod import yuminstall -class RHELInstallClass(BaseInstallClass): +class InstallClass(BaseInstallClass): # name has underscore used for mnemonics, strip if you dont need it id = "rhel" name = N_("Red Hat Enterprise Linux") -- 1.7.0.1

2 1

[rhel6-branch] gui: gray out OK button while adding raid set (#587161).
by Ales Kozumplik 30 Apr '10

30 Apr '10

This has a tricky part: the checkbox toggle callback in our implementation (WideCheckList.toggled_item) is called *before* the actual toggle occurs. This has to be considered in the button-enabling code. An alternative would be to change/extend the toggle callback hook mechanism. --- iw/raid_dialog_gui.py | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 8e31767..2e11cb5 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -45,7 +45,8 @@ class RaidEditor: store = gtk.TreeStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_STRING) - partlist = WideCheckList(2, store) + partlist = WideCheckList(2, store, + clickCB=self.raidlist_toggle_callback) sw = gtk.ScrolledWindow() sw.add(partlist) @@ -137,6 +138,7 @@ class RaidEditor: return [] while 1: + self.allow_ok_button() rc = self.dialog.run() # user hit cancel, do nothing @@ -400,7 +402,7 @@ class RaidEditor: dialog = gtk.Dialog(tstr, self.parent) gui.addFrame(dialog) dialog.add_button('gtk-cancel', 2) - dialog.add_button('gtk-ok', 1) + self.ok_button = dialog.add_button('gtk-ok', 1) dialog.set_position(gtk.WIN_POS_CENTER) maintable = gtk.Table() @@ -576,7 +578,37 @@ class RaidEditor: self.dialog = dialog return + def allow_ok_button(self, path=None): + """ + Determine if the OK button should be enabled. + + If path is given it points to the row where the toggle state is about to + change. + """ + model = self.raidlist.get_model() + allow = False + iter = model.get_iter_first() + toggled_iter = None + if path: + toggled_iter = model.get_iter(path) + while iter: + val = model.get_value(iter, 0) + if toggled_iter and \ + model.get_value(toggled_iter, 1) == \ + model.get_value(iter, 1): + # this is being toggled, negate the value: + if not val: + allow = True + else: + if val: + allow = True + iter = model.iter_next(iter) + + self.ok_button.set_sensitive(allow) + def raidlist_toggle_callback(self, data, path): + self.allow_ok_button(path) + return 1 class RaidCloneDialog: def createDriveList(self, disks): -- 1.6.6

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Anaconda-devel April 2010