Anaconda-devel March 2011

anaconda-devel@lists.fedoraproject.org

22 participants
107 discussions

[PATCH f15-branch master] mount needs to be told "nfs" or it assumes any argument is a device (#678414).
by Chris Lumens 29 Mar '11

29 Mar '11

--- loader/nfsinstall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index d313133..3706311 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -190,7 +190,7 @@ static unsigned int isNfsIso(struct loaderData_s *loaderData) { parseNfsHostPathOpts(loaderData->instRepo, &host, &path, &opts); checked_asprintf(&url, "%s:%s", host, path); - if (doPwMount(url, "/mnt/isodir", "auto", opts, NULL)) { + if (doPwMount(url, "/mnt/isodir", "nfs", opts, NULL)) { logMessage(ERROR, "couldn't mount %s to look for NFSISO", url); goto cleanup1; } -- 1.7.4.1

3 2

[master] Fix rebooting after a kickstart error is detected.
by Ales Kozumplik 28 Mar '11

28 Mar '11

1) make sure an actual reboot is done, not just a delayed reboot waiting for ctrl-c . 2) shutdown the user interface, this prevents screen in textmode from still running and mangling the terminating output. Resolves: rhbz#690748 --- pyanaconda/kickstart.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 4afdfb8..cf14899 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -1207,7 +1207,8 @@ class AnacondaKSHandler(superclass): except KickstartError as e: if self.anaconda.intf: self.anaconda.intf.kickstartErrorWindow(e.__str__()) - sys.exit(1) + self.anaconda.intf.shutdown() + sys.exit(0) else: stderrLog.critical(_("The following error was found while parsing the kickstart " "configuration file:\n\n%s") % e) -- 1.7.3.3

2 1

[PATCH][rhel6-branch] Fix missed conversion of createMetadataVer->metadataVersion.
by David Lehman 25 Mar '11

25 Mar '11

Resolves: rhbz#690469 --- storage/devices.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/storage/devices.py b/storage/devices.py index 0383220..c76410a 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -3048,7 +3048,7 @@ class MDRaidArrayDevice(StorageDevice): self.level, disks, spares, - metadataVer=self.createMetadataVer, + metadataVer=self.metadataVersion, bitmap=self.createBitmap, progress=w) except Exception: -- 1.7.3.4

2 1

[PATCH master] Return values, not strings
by Brian C. Lane 25 Mar '11

25 Mar '11

returning strings to insert into other strings makes it harder to translate so use the return value to select the correct string. --- pyanaconda/storage/__init__.py | 9 ++++++- pyanaconda/storage/devices.py | 39 +++++++++++++++++++---------------- pyanaconda/storage/partitioning.py | 10 +++++++- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index b000573..11f2acf 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -1104,8 +1104,13 @@ class Storage(object): for (mount, device) in filesystems.items(): problem = filesystems[mount].checkSize() - if problem: - errors.append(_("Your %s partition is too %s for %s formatting " + if problem < 0: + errors.append(_("Your %s partition is too small for %s formatting " + "(allowable size is %d MB to %d MB)") + % (mount, problem, device.format.name, + device.minSize, device.maxSize)) + elif problem > 0: + errors.append(_("Your %s partition is too large for %s formatting " "(allowable size is %d MB to %d MB)") % (mount, problem, device.format.name, device.minSize, device.maxSize)) diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index 303856b..017d48c 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -936,15 +936,16 @@ class StorageDevice(Device): """ Check to make sure the size of the device is allowed by the format used. - return None is all is ok - return large or small depending on the problem + Returns: + 0 - ok + 1 - Too large + -1 - Too small """ - problem = None if self.format.maxSize and self.size > self.format.maxSize: - problem = _("large") + return 1 elif self.format.minSize and self.size < self.format.minSize: - problem = _("small") - return problem + return -1 + return 0 class DiskDevice(StorageDevice): """ A disk """ @@ -1612,19 +1613,20 @@ class PartitionDevice(StorageDevice): """ Check to make sure the size of the device is allowed by the format used. - return None is all is ok - return large or small depending on the problem + Returns: + 0 - ok + 1 - Too large + -1 - Too small """ - problem = None if self.format.maxSize and self.size > self.format.maxSize: - problem = _("large") + return 1 elif (self.format.minSize and (not self.req_grow and self.size < self.format.minSize) or (self.req_grow and self.req_max_size and self.req_max_size < self.format.minSize)): - problem = _("small") - return problem + return -1 + return 0 class DMDevice(StorageDevice): """ A device-mapper device """ @@ -2588,19 +2590,20 @@ class LVMLogicalVolumeDevice(DMDevice): """ Check to make sure the size of the device is allowed by the format used. - return None is all is ok - return large or small depending on the problem + Returns: + 0 - ok + 1 - Too large + -1 - Too small """ - problem = None if self.format.maxSize and self.size > self.format.maxSize: - problem = _("large") + return 1 elif (self.format.minSize and (not self.req_grow and self.size < self.format.minSize) or (self.req_grow and self.req_max_size and self.req_max_size < self.format.minSize)): - problem = _("small") - return problem + return -1 + return 0 class MDRaidArrayDevice(StorageDevice): """ An mdraid (Linux RAID) device. """ diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py index aebd7b8..a699125 100644 --- a/pyanaconda/storage/partitioning.py +++ b/pyanaconda/storage/partitioning.py @@ -1001,8 +1001,14 @@ def allocatePartitions(storage, disks, partitions, freespace, bootloader=None): current_free = None problem = _part.checkSize() - if problem: - raise PartitioningError("partition is too %s for %s formatting " + if problem < 0: + raise PartitioningError("partition is too small for %s formatting " + "(allowable size is %d MB to %d MB)" + % (problem, _part.format.name, + _part.format.minSize, + _part.format.maxSize)) + elif problem > 0: + raise PartitioningError("partition is too large for %s formatting " "(allowable size is %d MB to %d MB)" % (problem, _part.format.name, _part.format.minSize, -- 1.7.4

2 1

[rhel5-branch] Fix shlex traceback if pxeboot cmdline ends in a quote (#500198)
by Will Woods 24 Mar '11

24 Mar '11

There's a pxelinux bug where it fails to add the beginning quote when it tries to add BOOT_IMAGE= to the commandline and the label has spaces (you get e.g.: 'linux BOOT_IMAGE=vmlinuz with label"') Previously we tried to fix this up by adding a quote after BOOT_IMAGE= whenever the cmdline ends in a quote. This causes us to have unbalanced quotes if the cmdline is something like: linux BOOT_IMAGE=vmlinuz ethtool="speed 100 duplex" With this change, we now split the commandline at BOOT_IMAGE= and check to see if the right side has unbalanced quotes. If so, we add a quote after BOOT_IMAGE=. --- flags.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flags.py b/flags.py index 0351889..a5d380a 100644 --- a/flags.py +++ b/flags.py @@ -37,8 +37,9 @@ class Flags: # if the BOOT_IMAGE contains a space, pxelinux will strip one of the # quotes leaving one at the end that shlex doesn't know what to do # with - if cmdline.find("BOOT_IMAGE=") and cmdline.endswith('"'): - cmdline = cmdline.replace("BOOT_IMAGE=", "BOOT_IMAGE=\"") + (left, middle, right) = cmdline.rpartition("BOOT_IMAGE=") + if right.count('"') % 2: + cmdline = left + middle + '"' + right lst = shlex.split(cmdline) -- 1.7.4

2 1

[PATCH f15-branch master] Fixup rindex usage (#678086)
by Brian C. Lane 24 Mar '11

24 Mar '11

rindex can return a NULL and the strcmp needs to check for .iso otherwise any file without .iso would cause a segfault --- loader/hdinstall.c | 2 +- loader/nfsinstall.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/hdinstall.c b/loader/hdinstall.c index c321afb..8f56f98 100644 --- a/loader/hdinstall.c +++ b/loader/hdinstall.c @@ -93,7 +93,7 @@ static int ends_with_iso(char *dirname, struct dirent *ent) { return 0; suffix = rindex(ent->d_name, '.'); - return (!strcmp(suffix, "iso")); + return (suffix && !strcmp(suffix, ".iso")); } int loadHdImages(struct loaderData_s *loaderData) { diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c index 45260c2..3abdbc0 100644 --- a/loader/nfsinstall.c +++ b/loader/nfsinstall.c @@ -178,7 +178,7 @@ static int ends_with_iso(char *dirname, struct dirent *ent) { return 0; suffix = rindex(ent->d_name, '.'); - return (!strcmp(suffix, ".iso")); + return (suffix && !strcmp(suffix, ".iso")); } static unsigned int isNfsIso(struct loaderData_s *loaderData) { -- 1.7.4

2 1

[PATCH master] Check size limits on pre-existing partitions
by Brian C. Lane 24 Mar '11

24 Mar '11

When editing a pre-existing partition and changing its format type we need to re-check the size limits. eg. mounting a partition on /boot/efi needs to make sure it is <= 256M Resolves: rhbz#684860 --- pyanaconda/storage/__init__.py | 8 ++++++ pyanaconda/storage/devices.py | 48 ++++++++++++++++++++++++++++++++++++ pyanaconda/storage/partitioning.py | 12 +-------- 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index a0cbdfa..b000573 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -1102,6 +1102,14 @@ class Storage(object): % {'mount': mount, 'size': size, 'productName': productName}) + for (mount, device) in filesystems.items(): + problem = filesystems[mount].checkSize() + if problem: + errors.append(_("Your %s partition is too %s for %s formatting " + "(allowable size is %d MB to %d MB)") + % (mount, problem, device.format.name, + device.minSize, device.maxSize)) + usb_disks = [] firewire_disks = [] for disk in self.disks: diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index 80bb7be..303856b 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -932,6 +932,19 @@ class StorageDevice(Device): break return grow + def checkSize(self): + """ Check to make sure the size of the device is allowed by the + format used. + + return None is all is ok + return large or small depending on the problem + """ + problem = None + if self.format.maxSize and self.size > self.format.maxSize: + problem = _("large") + elif self.format.minSize and self.size < self.format.minSize: + problem = _("small") + return problem class DiskDevice(StorageDevice): """ A disk """ @@ -1595,6 +1608,24 @@ class PartitionDevice(StorageDevice): return super(PartitionDevice, self).resizable and \ self.disk.type != 'dasd' + def checkSize(self): + """ Check to make sure the size of the device is allowed by the + format used. + + return None is all is ok + return large or small depending on the problem + """ + problem = None + if self.format.maxSize and self.size > self.format.maxSize: + problem = _("large") + elif (self.format.minSize and + (not self.req_grow and + self.size < self.format.minSize) or + (self.req_grow and self.req_max_size and + self.req_max_size < self.format.minSize)): + problem = _("small") + return problem + class DMDevice(StorageDevice): """ A device-mapper device """ _type = "dm" @@ -2553,6 +2584,23 @@ class LVMLogicalVolumeDevice(DMDevice): # is different (ofcourse) return "rd_LVM_LV=%s/%s" % (self.vg.name, self._name) + def checkSize(self): + """ Check to make sure the size of the device is allowed by the + format used. + + return None is all is ok + return large or small depending on the problem + """ + problem = None + if self.format.maxSize and self.size > self.format.maxSize: + problem = _("large") + elif (self.format.minSize and + (not self.req_grow and + self.size < self.format.minSize) or + (self.req_grow and self.req_max_size and + self.req_max_size < self.format.minSize)): + problem = _("small") + return problem class MDRaidArrayDevice(StorageDevice): """ An mdraid (Linux RAID) device. """ diff --git a/pyanaconda/storage/partitioning.py b/pyanaconda/storage/partitioning.py index e8f3921..aebd7b8 100644 --- a/pyanaconda/storage/partitioning.py +++ b/pyanaconda/storage/partitioning.py @@ -1000,17 +1000,7 @@ def allocatePartitions(storage, disks, partitions, freespace, bootloader=None): if _part.req_grow: current_free = None - problem = None - if _part.format.maxSize and _part.req_size > _part.format.maxSize: - problem = "large" - elif (_part.format.minSize and - (not _part.req_grow and - _part.req_size < _part.format.minSize) or - (_part.req_grow and _part.req_max_size and - _part.req_max_size < _part.format.minSize)): - # format max/min size also enforced in growPartitions - problem = "small" - + problem = _part.checkSize() if problem: raise PartitioningError("partition is too %s for %s formatting " "(allowable size is %d MB to %d MB)" -- 1.7.4

3 3

[master] Use proper store types for DataComboBoxes.
by Ales Kozumplik 24 Mar '11

24 Mar '11

GTK has become stricter about how the values inserted into a treestore need to adhere to the declared type of the store. Related: rhbz#682543 --- pyanaconda/iw/datacombo.py | 14 ++++++++------ pyanaconda/iw/lvm_dialog_gui.py | 3 ++- pyanaconda/iw/osbootwidget.py | 7 ++++--- pyanaconda/iw/partition_gui.py | 2 +- pyanaconda/iw/raid_dialog_gui.py | 3 ++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pyanaconda/iw/datacombo.py b/pyanaconda/iw/datacombo.py index 9b6a092..5d27b7a 100644 --- a/pyanaconda/iw/datacombo.py +++ b/pyanaconda/iw/datacombo.py @@ -24,12 +24,13 @@ import gtk import gobject class DataComboBox(gtk.ComboBox): - """A class derived from gtk.ComboBox to allow setting a user visible - string and (not-visible) data string""" + """ A class derived from gtk.ComboBox to allow setting a user visible string + and (not-visible) data object. + """ def __init__(self, store = None): if store is None: - self.store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + self.store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) else: self.store = store gtk.ComboBox.__init__(self, self.store) @@ -80,10 +81,11 @@ if __name__ == "__main__": def mycb(widget, *args): idx = widget.get_active() print(idx, widget.get_stored_data(idx), widget.get_text(idx)) - + win = gtk.Window() - cb = DataComboBox() + store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + cb = DataComboBox(store) cb.append("/dev/hda5", "hda5") cb.append("/dev/hda6", "hda6") cb.append("/dev/hda7", "hda7") @@ -91,7 +93,7 @@ if __name__ == "__main__": cb.set_active_text("/dev/hda7") cb.connect('changed', mycb) - + win.add(cb) win.show_all() diff --git a/pyanaconda/iw/lvm_dialog_gui.py b/pyanaconda/iw/lvm_dialog_gui.py index 389b54e..c0703e0 100644 --- a/pyanaconda/iw/lvm_dialog_gui.py +++ b/pyanaconda/iw/lvm_dialog_gui.py @@ -255,7 +255,8 @@ class VolumeGroupEditor: return "%s GB" % (val/1024/1024,) def createPEOptionMenu(self, default=4096): - peCombo = datacombo.DataComboBox() + store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_INT) + peCombo = datacombo.DataComboBox(store) actualPE = [] for curpe in lvm.getPossiblePhysicalExtents(floor=1024): diff --git a/pyanaconda/iw/osbootwidget.py b/pyanaconda/iw/osbootwidget.py index 9fc3dbd..1b18070 100644 --- a/pyanaconda/iw/osbootwidget.py +++ b/pyanaconda/iw/osbootwidget.py @@ -163,7 +163,8 @@ class OSBootWidget: parts.append(part) - deviceCombo = datacombo.DataComboBox() + store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + deviceCombo = datacombo.DataComboBox(store) defindex = 0 i = 0 for part in parts: @@ -174,7 +175,7 @@ class OSBootWidget: deviceCombo.set_active(defindex) - + table.attach(deviceCombo, 1, 2, 2, 3, gtk.FILL, 0, 10) label.set_mnemonic_widget(deviceCombo) else: @@ -189,7 +190,7 @@ class OSBootWidget: default.set_sensitive(False) else: default.set_sensitive(True) - + dialog.vbox.pack_start(table) dialog.show_all() diff --git a/pyanaconda/iw/partition_gui.py b/pyanaconda/iw/partition_gui.py index bb2c9fc..2a2ce97 100644 --- a/pyanaconda/iw/partition_gui.py +++ b/pyanaconda/iw/partition_gui.py @@ -969,7 +969,7 @@ class PartitionWindow(InstallWindow): if vg.freeSpace > 0: iter = self.tree.append(vgparent) self.tree[iter]['Device'] = _("Free") - self.tree[iter]['Size (MB)'] = vg.freeSpace + self.tree[iter]['Size (MB)'] = str(vg.freeSpace) self.tree[iter]['PyObject'] = None self.tree[iter]['Mount Point'] = "" self.tree[iter]['IsLeaf'] = True diff --git a/pyanaconda/iw/raid_dialog_gui.py b/pyanaconda/iw/raid_dialog_gui.py index 731f6ee..35f23f9 100644 --- a/pyanaconda/iw/raid_dialog_gui.py +++ b/pyanaconda/iw/raid_dialog_gui.py @@ -100,7 +100,8 @@ class RaidEditor: return levelcombo def createRaidMinorMenu(self, minors, reqminor): - minorcombo = datacombo.DataComboBox() + store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_INT) + minorcombo = datacombo.DataComboBox(store) defindex = 0 i = 0 for minor in minors: -- 1.7.3.3

2 2

[rhel6-branch] make sure latest kernel is default boot choice
by David Cantrell 23 Mar '11

23 Mar '11

Pretty simple. Tested with fresh RHEL 6.0 installs upgrading to 6.1. Also tested with fresh 6.1 installs. All seems to work. Touches some msw lines that haven't seen attention since 2001 (do a git annotate). Also applicable to the master branch. -- David Cantrell <dcantrell(a)redhat.com> Supervisor, Installer Engineering Team Red Hat, Inc. | Honolulu, HI | UTC-10

2 2

[PATCH f15-branch] Make cherry-pick from master complete (#673824)
by Radek Vykydal 23 Mar '11

23 Mar '11

patch of cherry-picking commit 4635296beb7a51712dc95ff9903dd44af1767758 was made on top of a patch that went only into master. --- loader/kickstart.c | 8 +------- loader/net.c | 14 ++++++++++++++ loader/net.h | 1 + 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/loader/kickstart.c b/loader/kickstart.c index 8c8b3bf..1893375 100644 --- a/loader/kickstart.c +++ b/loader/kickstart.c @@ -412,13 +412,7 @@ int isKickstartFileRemote(char *ksFile) { location = ksFile + 3; } - if (!strncmp(location, "http", 4) || - !strncmp(location, "ftp://", 6) || - !strncmp(location, "nfs:", 4)) { - return 1; - } else { - return 0; - } + return isURLRemote(location); } void getKickstartFile(struct loaderData_s *loaderData) { diff --git a/loader/net.c b/loader/net.c index 399aa16..14ffee0 100644 --- a/loader/net.c +++ b/loader/net.c @@ -2077,6 +2077,20 @@ int get_connection(iface_t *iface) { return 3; } +int isURLRemote(char *url) { + if (url == NULL) { + return 0; + } + + if (!strncmp(url, "http", 4) || + !strncmp(url, "ftp://", 6) || + !strncmp(url, "nfs:", 4)) { + return 1; + } else { + return 0; + } +} + int isValidIPv4Address(const char *address) { int rc; struct in_addr addr; diff --git a/loader/net.h b/loader/net.h index d34e42f..9bf53c1 100644 --- a/loader/net.h +++ b/loader/net.h @@ -73,6 +73,7 @@ int kickstartNetworkUp(struct loaderData_s * loaderData, iface_t * iface); void splitHostname (char *str, char **host, char **port); int get_connection(iface_t * iface); +int isURLRemote(char *url); int isValidIPv4Address(const char *address); #ifdef ENABLE_IPV6 int isValidIPv6Address(const char *address); -- 1.7.2

2 1

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