anaconda-patches May 2016

anaconda-patches@lists.fedorahosted.org

9 participants
1078 discussions

Re: [rhinstaller/initial-setup/pulls/11 rhel7-branch] Use the environs flag when setting the environment
by dashea 31 May '16

31 May '16

Added label: rhel7-branch. -- To view this pull request on github, visit https://github.com/rhinstaller/initial-setup/pull/11

1 0

[rhel7-branch 1/1] Use the environs flag when setting the environment
by dashea 31 May '16

31 May '16

From: Martin Kolman <mkolman(a)redhat.com> The _environs Hub property has been replaced by the environs flag. Related: rhbz#1270354 --- initial-setup.spec | 2 +- initial_setup/__init__.py | 5 +++++ initial_setup/gui/hubs/initial_setup_hub.py | 2 -- initial_setup/tui/hubs/initial_setup_hub.py | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/initial-setup.spec b/initial-setup.spec index a231add..fe900df 100644 --- a/initial-setup.spec +++ b/initial-setup.spec @@ -13,7 +13,7 @@ Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz %define debug_package %{nil} -%define anacondaver 21.48.22.36 +%define anacondaver 21.48.22.75 License: GPLv2+ Group: System Environment/Base diff --git a/initial_setup/__init__.py b/initial_setup/__init__.py index 74928e4..288cc31 100644 --- a/initial_setup/__init__.py +++ b/initial_setup/__init__.py @@ -14,6 +14,8 @@ from pyanaconda import iutil from pykickstart.constants import FIRSTBOOT_RECONFIG from pyanaconda.localization import setup_locale_environment, setup_locale +from pyanaconda.constants import FIRSTBOOT_ENVIRON +from pyanaconda.flags import flags class InitialSetupError(Exception): pass @@ -33,6 +35,9 @@ class InitialSetupError(Exception): "selinux", "firewall"] +# set the environment so that spokes can behave accordingly +flags.environs = [FIRSTBOOT_ENVIRON] + # set root to "/", we are now in the installed system iutil.setSysroot("/") diff --git a/initial_setup/gui/hubs/initial_setup_hub.py b/initial_setup/gui/hubs/initial_setup_hub.py index 0fb6cb4..346c01e 100644 --- a/initial_setup/gui/hubs/initial_setup_hub.py +++ b/initial_setup/gui/hubs/initial_setup_hub.py @@ -1,4 +1,3 @@ -from pyanaconda.constants import FIRSTBOOT_ENVIRON from pyanaconda.ui.gui.hubs import Hub from pyanaconda.ui.gui.spokes import NormalSpoke as GUI_spoke_class from initial_setup import product @@ -16,7 +15,6 @@ class InitialSetupMainHub(Hub): def __init__(self, *args): Hub.__init__(self, *args) - self._environs = [FIRSTBOOT_ENVIRON] def _collectCategoriesAndSpokes(self): return common.collectCategoriesAndSpokes(self, GUI_spoke_class) diff --git a/initial_setup/tui/hubs/initial_setup_hub.py b/initial_setup/tui/hubs/initial_setup_hub.py index c87d528..d2cb1ce 100644 --- a/initial_setup/tui/hubs/initial_setup_hub.py +++ b/initial_setup/tui/hubs/initial_setup_hub.py @@ -1,4 +1,3 @@ -from pyanaconda.constants import FIRSTBOOT_ENVIRON from pyanaconda.ui.tui.hubs import TUIHub from pyanaconda.ui.tui.spokes import NormalSpoke as TUI_spoke_class from initial_setup import product @@ -22,7 +21,6 @@ class InitialSetupMainHub(TUIHub): def __init__(self, *args): TUIHub.__init__(self, *args) - self._environs = [FIRSTBOOT_ENVIRON] def _collectCategoriesAndSpokes(self): return common.collectCategoriesAndSpokes(self, TUI_spoke_class) -- To view this commit on github, visit https://github.com/rhinstaller/initial-setup/commit/ce8337d72909ef5a99667a6…

1 0

Re: [rhinstaller/initial-setup/pulls/11 rhel7-branch] Use the environs flag when setting the environment
by dashea 31 May '16

31 May '16

Added label: master. -- To view this pull request on github, visit https://github.com/rhinstaller/initial-setup/pull/11

1 0

[rhel7-branch 2/2] Only try to restart payload in the Anaconda environment
by dashea 31 May '16

31 May '16

From: Martin Kolman <mkolman(a)redhat.com> Outside of the Anaconda environment, such as in Initial setup, there might be no payload to restart. This might lead to a crash and/or confusing error messages in logs. Related: rhbz#1270354 --- pyanaconda/ui/gui/spokes/network.py | 11 +++++++---- pyanaconda/ui/tui/spokes/network.py | 10 ++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index 80f9a55..78ea7ef 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -1497,10 +1497,13 @@ def apply(self): log.debug("network: apply ksdata %s", self.data.network) if self.networking_changed: - log.debug("network spoke (apply) refresh payload") - from pyanaconda.packaging import payloadMgr - payloadMgr.restartThread(self.storage, self.data, self.payload, self.instclass, - fallback=not anaconda_flags.automatedInstall) + if ANACONDA_ENVIRON in anaconda_flags.environs: + log.debug("network spoke (apply) refresh payload") + from pyanaconda.packaging import payloadMgr + payloadMgr.restartThread(self.storage, self.data, self.payload, self.instclass, + fallback=not anaconda_flags.automatedInstall) + else: + log.debug("network spoke (apply), payload refresh skipped (running outside of installation environment)") self.networking_changed = False else: log.debug("network spoke (apply), no changes detected") diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py index f60b9ec..0baa923 100644 --- a/pyanaconda/ui/tui/spokes/network.py +++ b/pyanaconda/ui/tui/spokes/network.py @@ -21,7 +21,7 @@ # -from pyanaconda.flags import can_touch_runtime_system +from pyanaconda.flags import can_touch_runtime_system, environs from pyanaconda.ui.categories.system import SystemCategory from pyanaconda.ui.tui.spokes import EditTUISpoke, OneShotEditTUIDialog from pyanaconda.ui.tui.spokes import EditTUISpokeEntry as Entry @@ -33,6 +33,7 @@ from pyanaconda.regexes import IPV4_PATTERN_WITHOUT_ANCHORS, IPV4_NETMASK_WITHOUT_ANCHORS from pyanaconda.constants_text import INPUT_PROCESSED +from pyanaconda.constants import ANACONDA_ENVIRON import logging log = logging.getLogger("anaconda") @@ -244,9 +245,10 @@ def apply(self): if self._apply: self._apply = False - from pyanaconda.packaging import payloadMgr - payloadMgr.restartThread(self.storage, self.data, self.payload, - self.instclass, checkmount=False) + if ANACONDA_ENVIRON in environs: + from pyanaconda.packaging import payloadMgr + payloadMgr.restartThread(self.storage, self.data, self.payload, + self.instclass, checkmount=False) def _update_network_data(self): hostname = self.data.network.hostname -- To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/470b5b09de6fcd4b34e1149d8d15…

1 0

[rhel7-branch 1/2] Make current runtime environment identifiers available via flags
by dashea 31 May '16

31 May '16

From: Martin Kolman <mkolman(a)redhat.com> This makes the identifier easily accessible to Anaconda & addons in case they want to change their behavior based on the current runtime environment. Related: rhbz#1270354 --- pyanaconda/flags.py | 4 +++- pyanaconda/ui/common.py | 3 --- pyanaconda/ui/gui/hubs/__init__.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py index d647239..8a97f95 100644 --- a/pyanaconda/flags.py +++ b/pyanaconda/flags.py @@ -20,7 +20,7 @@ import selinux import shlex import glob -from pyanaconda.constants import SELINUX_DEFAULT, CMDLINE_APPEND +from pyanaconda.constants import SELINUX_DEFAULT, CMDLINE_APPEND, ANACONDA_ENVIRON from collections import OrderedDict import logging @@ -76,6 +76,8 @@ def __init__(self, read_cmdline=True): self.nosave_logs = False # single language options self.singlelang = False + # current runtime environments + self.environs = [ANACONDA_ENVIRON] # parse the boot commandline self.cmdline = BootArgs() # Lock it down: no more creating new flags! diff --git a/pyanaconda/ui/common.py b/pyanaconda/ui/common.py index e4f994e..39e7bb3 100644 --- a/pyanaconda/ui/common.py +++ b/pyanaconda/ui/common.py @@ -495,9 +495,6 @@ def __init__(self, storage, payload, instclass): self.paths = {} self._spokes = {} - # spokes for which environments this hub should collect? - self._environs = [ANACONDA_ENVIRON] - @abstractproperty def data(self): pass diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py index 2563300..4aaab17 100644 --- a/pyanaconda/ui/gui/hubs/__init__.py +++ b/pyanaconda/ui/gui/hubs/__init__.py @@ -114,7 +114,7 @@ def _createBox(self): selectors = [] for spokeClass in sorted(cats_and_spokes[c], key=lambda s: s.title): # Check if this spoke is to be shown in the supported environments - if not any(spokeClass.should_run(environ, self.data) for environ in self._environs): + if not any(spokeClass.should_run(environ, self.data) for environ in flags.environs): continue # Create the new spoke and populate its UI with whatever data. -- To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/52b59975c97244d7950554b0db60…

1 0

New: [rhinstaller/anaconda/pulls/652 rhel7-branch] Don't try to do payload reset in Initial Setup
by dashea 31 May '16

31 May '16

At the moment the network spoke tries to trigger a payload reset when network settings are changed even if running inside of Initial Setup. This is of course wrong, as there is no payload instance in Initial Setup, which can trigger a lot of various issues (crashes, weird log messages, etc.). The first patch adds the environs flag so that spokes can easily check the environment at runtime. It also gets rid of the old _environs hub property. The second patch then uses the environs flag to only trigger the payload reset when the network spoke is run from inside of Anaconda. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/652

1 0

Re: [rhinstaller/anaconda/pulls/652 rhel7-branch] Don't try to do payload reset in Initial Setup
by dashea 31 May '16

31 May '16

Added label: rhel7-branch. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/652

1 0

Re: [rhinstaller/anaconda/pulls/652 rhel7-branch] Don't try to do payload reset in Initial Setup
by dashea 31 May '16

31 May '16

Added label: master. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/652

1 0

[PATCH rhel7-branch] network: add support for --no-activate kickstart opton (#1277975)
by Radek Vykydal 31 May '16

31 May '16

Resolves: rhbz#1277975 This will allow to override special default of first network command which is --activate. The use case is activating a device via boot options (eg for nfs mount of installation image or source) and using another configuration for target system via kickstart (nfs mount and installation could stale in this case if the ip address changes for example). I was considering also making --activate option support optional arguments (allowing both for --activate for compatibility and --activate=no for this use case) but optparse used in rhel7 pykickstart doesn't allow for nargs=? (zero or one argument) as argparse does. https://www.redhat.com/archives/anaconda-devel-list/2016-May/msg00008.html --- dracut/parse-kickstart | 3 ++- pyanaconda/network.py | 2 +- pyanaconda/ui/gui/spokes/network.py | 8 +++++++- pyanaconda/ui/tui/spokes/network.py | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart index 9c36402..08d536a 100755 --- a/dracut/parse-kickstart +++ b/dracut/parse-kickstart @@ -178,7 +178,8 @@ class Network(commands.network.RHEL7_Network, DracutArgsMixin): # first 'network' line if len(self.network) == 1: - net.activate = True + if not net.noactivate: + net.activate = True # Note that there may be no net.device and no ksdevice if inst.ks=file:/ks.cfg # If that is the case, fall into ksnet_to_dracut with net.device=None and let # it handle things. diff --git a/pyanaconda/network.py b/pyanaconda/network.py index 402456f..b2e9503 100644 --- a/pyanaconda/network.py +++ b/pyanaconda/network.py @@ -1203,7 +1203,7 @@ def apply_kickstart(ksdata): # If we have kickstart ifcfg from initramfs if "Generated by parse-kickstart" in f.read(): # and we should activate the device - if i == 0 or network_data.activate: + if (i == 0 and not network_data.noactivate) or network_data.activate: ifcfg = IfcfgFile(ifcfg_path) ifcfg.read() con_uuid = ifcfg.get("UUID") diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index b48296b..aeea217 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -1636,13 +1636,19 @@ class NetworkStandaloneSpoke(StandaloneSpoke): def _update_network_data(data, ncb): data.network.network = [] - for dev_cfg in ncb.dev_cfgs: + for i, dev_cfg in enumerate(ncb.dev_cfgs): devname = dev_cfg.get_iface() nd = network.ksdata_from_ifcfg(devname, dev_cfg.con_uuid) if not nd: continue if devname in nm.nm_activated_devices(): nd.activate = True + else: + # First network command defaults to --activate so we must + # use --no-activate explicitly to prevent the default + if i == 0: + nd.noactivate = True + data.network.network.append(nd) hostname = ncb.hostname network.update_hostname_data(data, hostname) diff --git a/pyanaconda/ui/tui/spokes/network.py b/pyanaconda/ui/tui/spokes/network.py index 4b56890..9f1fe6e 100644 --- a/pyanaconda/ui/tui/spokes/network.py +++ b/pyanaconda/ui/tui/spokes/network.py @@ -257,12 +257,17 @@ class NetworkSpoke(FirstbootSpokeMixIn, EditTUISpoke): hostname = self.data.network.hostname self.data.network.network = [] - for name in nm.nm_devices(): + for i, name in enumarate(nm.nm_devices()): nd = network.ksdata_from_ifcfg(name) if not nd: continue if name in nm.nm_activated_devices(): nd.activate = True + else: + # First network command defaults to --activate so we must + # use --no-activate explicitly to prevent the default + if i == 0: + nd.noactivate = True self.data.network.network.append(nd) (valid, error) = network.sanityCheckHostname(self.hostname_dialog.value) -- 2.4.3

2 4

Re: [rhinstaller/anaconda/pulls/645 rhel7-branch] NFS DDs installation now works correctly (#1269915)
by dashea 31 May '16

31 May '16

Pushed. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/645

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches May 2016