anaconda-patches May 2014

anaconda-patches@lists.fedorahosted.org

17 participants
141 discussions

[anaconda][master][PATCH] Parse boot options before parsing CLI options (#1101341)
by Martin Kolman 28 May '14

28 May '14

First parse all boot options relevant to Anaconda and only then parse CLI options (if any). This makes it possible for CLI options to override boot options, which could be useful for example when running Anaconda during a live installation. This also fixes issues with boot options that have a default value in the Anaconda argument parser - such options were previously ignored, resulting for example in the "text" boot option not triggering the text mode. Signed-off-by: Martin Kolman <mkolman(a)redhat.com> --- pyanaconda/anaconda_argparse.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pyanaconda/anaconda_argparse.py b/pyanaconda/anaconda_argparse.py index 35272fe..33b1f4e 100644 --- a/pyanaconda/anaconda_argparse.py +++ b/pyanaconda/anaconda_argparse.py @@ -30,7 +30,7 @@ import fcntl import termios import struct -from argparse import ArgumentParser, ArgumentError, HelpFormatter +from argparse import ArgumentParser, ArgumentError, HelpFormatter, Namespace from pyanaconda.flags import BootArgs @@ -146,10 +146,10 @@ class AnacondaArgumentParser(ArgumentParser): self.deprecated_bootargs.append(arg) return option - def parse_boot_cmdline(self, boot_cmdline, namespace): + def parse_boot_cmdline(self, boot_cmdline): """ - Parse the boot cmdline and set appropriate namespace according to - the options set by add_argument. + Parse the boot cmdline and create an appropriate Namespace instance + according to the option definitions set by add_argument. boot_cmdline can be given as a string (to be parsed by BootArgs), or a dict (or any object with .iteritems()) of {bootarg:value} pairs. @@ -158,17 +158,17 @@ class AnacondaArgumentParser(ArgumentParser): by default (/proc/cmdline, /run/initramfs/etc/cmdline, /etc/cmdline). If an option requires a value but the boot arg doesn't provide one, - we'll quietly not set anything. + we'll quietly not set anything in the Namespace. We also skip any boot options + that were not specified by add_argument as we don't care about them + (there will usually be quite a lot of them (rd.*, etc.). :param boot_cmdline: the Anaconda boot command line arguments :type boot_cmdline: string, dict or None - :param namespace: argparse Namespace instance - :type namespace: argparse Namespace - :returns: an argparse Namespace instance :rtype: Namespace """ + namespace = Namespace() if boot_cmdline is None or type(boot_cmdline) is str: bootargs = BootArgs(boot_cmdline) else: @@ -182,12 +182,9 @@ class AnacondaArgumentParser(ArgumentParser): if option is None: # this boot option is unknown to Anaconda, skip it continue - if getattr(namespace, option.dest) is not None: - # if the option is already set on program command line, - # we ignore any boot options that might modify it - continue if option.nargs != 0 and val is None: - # nargs == 0 -> option does not take any values, skip it + # nargs == 0 -> the option expects one or more arguments but the + # boot option was not given any, so we skip it continue # TODO: emit a warning or something there? if option.nargs == 0 and option.const is not None: # nargs == 0 & constr == True -> store_true @@ -224,11 +221,13 @@ class AnacondaArgumentParser(ArgumentParser): :returns: an argparse Namespace instance :rtype: Namespace """ - # parse arguments (if any) and return the resulting namespace - namespace = ArgumentParser.parse_args(self, args) - # now parse boot options (if any) and modify the namespace accordingly - namespace = self.parse_boot_cmdline(boot_cmdline, namespace) - # and return the resulting namespace + # parse boot options first + namespace = self.parse_boot_cmdline(boot_cmdline) + # parse CLI arguments (if any) and add them to the namespace + # created from parsing boot options, overriding any options + # with the same destination already present in the namespace + # NOTE: this basically means that CLI options override boot options + namespace = ArgumentParser.parse_args(self, args, namespace) return namespace def name_path_pairs(image_specs): -- 1.9.3

3 6

[master][PATCH] Make parse-kickstart aware of the %addon section (#1083002)
by Vratislav Podzimek 28 May '14

28 May '14

We don't want to parse and process data from the %addon section in the early dracut stage, but still the section has to be setup to the NullSection to prevent errors. Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- dracut/parse-kickstart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 6659d1e..f843d4f 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -196,6 +196,11 @@ class DracutHandler(handlerclass): handlerclass.__init__(self, commandUpdates=dracutCmds) self.output = [] self.ksdevice = None + + def setupSections(self): + super(DracutHandler, self).setupSections() + self.registerSection(NullSection(self.handler, sectionOpen="%addon")) + def dispatcher(self, args, lineno): obj = handlerclass.dispatcher(self, args, lineno) # and execute any specified dracut_args -- 1.9.3

2 3

[PATCH] network: use IpInterface only for activated devices (#1101781)
by Radek Vykydal 28 May '14

28 May '14

A fixup of commit 1282239f8035100da50fe7fe2f7be532677e042a. As NM docs say: This property may not refer to the actual data interface until the device has successfully established a data connection, indicated by the device's State becoming ACTIVATED. --- pyanaconda/nm.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 1faf07c..8114a4d 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -150,7 +150,7 @@ def nm_devices(): device_type = _get_property(device, "DeviceType", ".Device") if device_type not in supported_device_types: continue - iface = _get_property(device, "IpInterface", ".Device") + iface = _get_property(device, "Interface", ".Device") interfaces.append(iface) return interfaces @@ -175,6 +175,8 @@ def nm_activated_devices(): devices = _get_property(ac, "Devices", ".Connection.Active") for device in devices: iface = _get_property(device, "IpInterface", ".Device") + if not iface: + iface = _get_property(device, "Interface", ".Device") interfaces.append(iface) return interfaces @@ -498,7 +500,7 @@ def nm_device_slaves(name): slave_ifaces = [] for slave in slaves: - iface = _get_property(slave, "IpInterface", ".Device") + iface = _get_property(slave, "Interface", ".Device") slave_ifaces.append(iface) return slave_ifaces -- 1.9.0

2 1

[PATCH] network: use IpInterface instead of Interface (#1058906, #1029214)
by Radek Vykydal 28 May '14

28 May '14

For example for GSM modems we don't care about control interface (eg ttyUSB0) but about data interface (eg ppp0). --- pyanaconda/nm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py index 40058f3..b6cade6 100644 --- a/pyanaconda/nm.py +++ b/pyanaconda/nm.py @@ -150,7 +150,7 @@ def nm_devices(): device_type = _get_property(device, "DeviceType", ".Device") if device_type not in supported_device_types: continue - iface = _get_property(device, "Interface", ".Device") + iface = _get_property(device, "IpInterface", ".Device") interfaces.append(iface) return interfaces @@ -174,7 +174,7 @@ def nm_activated_devices(): continue devices = _get_property(ac, "Devices", ".Connection.Active") for device in devices: - iface = _get_property(device, "Interface", ".Device") + iface = _get_property(device, "IpInterface", ".Device") interfaces.append(iface) return interfaces @@ -498,7 +498,7 @@ def nm_device_slaves(name): slave_ifaces = [] for slave in slaves: - iface = _get_property(slave, "Interface", ".Device") + iface = _get_property(slave, "IpInterface", ".Device") slave_ifaces.append(iface) return slave_ifaces -- 1.9.0

3 3

[PATCH] Fix issues with auto* and version.py
by David Shea 28 May '14

28 May '14

automake is really kind of terrible at python. Filter the generated version.py out of the dist files so that builds from a dist tarball don't end up with a both a $srcdir and $builddir copy of version.py. Ignore a pylint error about importing version since version.py ends up in a different directory than the rest of the pyanaconda module. --- pyanaconda/Makefile.am | 6 +++++- pyanaconda/startup_utils.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pyanaconda/Makefile.am b/pyanaconda/Makefile.am index eeac1ae..2d48bd2 100644 --- a/pyanaconda/Makefile.am +++ b/pyanaconda/Makefile.am @@ -24,4 +24,8 @@ MAINTAINERCLEANFILES = Makefile.in # anaconda Python code pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME) anacondadir = $(pkgpyexecdir) -anaconda_PYTHON = $(sort $(wildcard $(srcdir)/*.py $(builddir)/version.py)) + +# Filter version.py out of the distributed python files since it will +# be generated by the configure script +anaconda_PYTHON = $(filter-out %/version.py,$(wildcard $(srcdir)/*.py)) +nodist_anaconda_PYTHON = $(builddir)/version.py diff --git a/pyanaconda/startup_utils.py b/pyanaconda/startup_utils.py index 1c04082..30d5974 100644 --- a/pyanaconda/startup_utils.py +++ b/pyanaconda/startup_utils.py @@ -70,7 +70,10 @@ def get_anaconda_version_string(): # non-necessary stuff; we also need to handle the possibility of the # import itself failing if module_exists("pyanaconda.version"): - from pyanaconda import version + # Ignore pylint not finding the version module, since thanks to automake + # there's a good chance that version.py is not in the same directory as + # the rest of pyanaconda. + from pyanaconda import version # pylint: disable=no-name-in-module return version.__version__ else: return "unknown" -- 1.9.3

3 2

[PATCH] Ignore deprecation warnings for atk_role_register
by David Shea 28 May '14

28 May '14

--- widgets/src/DiskOverview.c | 5 +++++ widgets/src/SpokeSelector.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/widgets/src/DiskOverview.c b/widgets/src/DiskOverview.c index 79dcd81..5c7fe10 100644 --- a/widgets/src/DiskOverview.c +++ b/widgets/src/DiskOverview.c @@ -327,7 +327,12 @@ static void anaconda_disk_overview_init(AnacondaDiskOverview *widget) { /* And this one is to handle when you select a DiskOverview via keyboard. */ g_signal_connect(widget, "key-release-event", G_CALLBACK(anaconda_disk_overview_clicked), NULL); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + /* No existing role is appropriate for this, so ignore the warning raised + by registering a new role. */ role = atk_role_register("disk overview"); +#pragma GCC diagnostic pop atk = gtk_widget_get_accessible(GTK_WIDGET(widget)); atk_object_set_role(atk, role); diff --git a/widgets/src/SpokeSelector.c b/widgets/src/SpokeSelector.c index 7d9da12..2486071 100644 --- a/widgets/src/SpokeSelector.c +++ b/widgets/src/SpokeSelector.c @@ -304,7 +304,12 @@ static void anaconda_spoke_selector_init(AnacondaSpokeSelector *spoke) { gtk_container_add(GTK_CONTAINER(spoke), spoke->priv->grid); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + /* No existing role is appropriate for this, so ignore the warning raised + by registering a new role. */ role = atk_role_register("spoke selector"); +#pragma GCC diagnostic pop atk = gtk_widget_get_accessible(GTK_WIDGET(spoke)); atk_object_set_name(atk, _(DEFAULT_TITLE)); -- 1.9.0

3 2

[PATCH] Check that bootloader devices are configured before validating (#1100928)
by David Shea 27 May '14

27 May '14

--- pyanaconda/bootloader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index f76af7e..a67d79c 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1353,7 +1353,8 @@ class GRUB(BootLoader): # If the stage2 device is on a raid1, check that the stage1 device is also redundant, # either by also being part of an array or by being a disk (which is expanded # to every disk in the array by install_targets). - if self.stage2_device.type == "mdarray" and \ + if self.stage1_device and self.stage2_device and \ + self.stage2_device.type == "mdarray" and \ self.stage2_device.level == raid.RAID1 and \ self.stage1_device.type != "mdarray": if not self.stage1_device.isDisk: -- 1.9.0

2 1

[PATCH] Fix the nm test for big-endian results
by David Shea 27 May '14

27 May '14

--- tests/pyanaconda_tests/nm_test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/pyanaconda_tests/nm_test.py b/tests/pyanaconda_tests/nm_test.py index 177a525..26614a1 100644 --- a/tests/pyanaconda_tests/nm_test.py +++ b/tests/pyanaconda_tests/nm_test.py @@ -20,6 +20,7 @@ from pyanaconda import nm import unittest +import socket class UtilityFunctionsTests(unittest.TestCase): @@ -39,6 +40,7 @@ class UtilityFunctionsTests(unittest.TestCase): self.assertEqual(nm.nm_dbus_int_to_ipv4(nm.nm_ipv4_to_dbus_int(address)), address) + # The result will be 23505088 little-endian or 3232261633 big-endian self.assertEqual(nm.nm_ipv4_to_dbus_int("192.168.102.1"), - 23505088) + socket.ntohl(3232261633)) -- 1.9.3

2 1

[PATCH] Allow file:// url handler in --repo arg
by Brian C. Lane 27 May '14

27 May '14

When doing --image installations it would be nice to be able to point to a local repo without needing a http server. The fix here is simple, treat a --repo=file:/// as a url method and everything works. There was a suggestion to allow pointing directly to an iso file, but adding support for that would mean complicating the code. It is better to allow the user to mount their image and point Anaconda to the moutpoint. --- anaconda | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anaconda b/anaconda index 7499bc3..8eff482 100755 --- a/anaconda +++ b/anaconda @@ -1068,7 +1068,8 @@ if __name__ == "__main__": ksdata.method.partition = device ksdata.method.dir = path elif anaconda.methodstr.startswith("http") or \ - anaconda.methodstr.startswith("ftp"): + anaconda.methodstr.startswith("ftp") or \ + anaconda.methodstr.startswith("file"): ksdata.method.method = "url" ksdata.method.url = anaconda.methodstr # installation source specified by bootoption -- 1.9.0

2 1

[blivet][master][PATCH] Do not alter the ParentList being iterated over (#1083581)
by Vratislav Podzimek 27 May '14

27 May '14

Removing items from a list that is being iterated over may result in various weird, unexpected and hard to track issues (see rhbz#1083581 and rhbz#1083581). Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com> --- blivet/devices.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/blivet/devices.py b/blivet/devices.py index 787fbb5..cdd0642 100644 --- a/blivet/devices.py +++ b/blivet/devices.py @@ -296,7 +296,9 @@ class Device(util.ObjectID): self._parents = ParentList(appendfunc=self._addParent, removefunc=self._removeParent) - for parent in self._parents: + # iterate over a copy of the parent list because we are altering it in + # the for-cycle + for parent in list(self._parents): self._parents.remove(parent) def _setParentList(self, parents): -- 1.9.3

2 1

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches May 2014