[rhel7-branch] Fix 'b' to begin installation handling
by Vratislav Podzimek
This patch fixes the code adding the "'b' to begin installation" functionality
which is only needed in the Summary hub and thus should be in its code instead
of its parent class' code. Without this patch Initial Setup requires hitting 'b'
to continue even if it prompts for 'c' and even if it makes no sense to use 'b'
in the Initial Setup.
I've overlooked this issue when reviewing the commit
eef1c66f51a9c792a33938a5e12efd5ef39e52d0.
Vratislav Podzimek (1):
Only the Summary TUI hub wants to accept 'b' to continue (#1077546)
pyanaconda/ui/tui/hubs/__init__.py | 11 ++---------
pyanaconda/ui/tui/hubs/summary.py | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 9 deletions(-)
--
1.8.5.3
10 years, 2 months
[blivet] Size related patches
by Vratislav Podzimek
These three patches fix few places were we haven't been using Size instances
while we should have.
Vratislav Podzimek (3):
Allow creating Size instance from another Size instance
Make sure StorageDevice's self._size is a Size instance (#1077179)
All size specifications should be Size instances (#1077163)
blivet/devices.py | 30 +++++++++++++++---------------
blivet/size.py | 2 ++
2 files changed, 17 insertions(+), 15 deletions(-)
--
1.8.5.3
10 years, 2 months
[master (v2)] More test path changes
by David Shea
Change all tests that scan all files to scan only the list of files known to
git if run from a git tree. Otherwise, scan all files, which fixes (for
example) make distcheck for pylint. Included all of the files in the commit
this time, and added filtering options to the shell and python functions.
David Shea (1):
Make the lists of files to check consistent across all checks.
tests/Makefile.am | 1 +
tests/cppcheck/runcppcheck.sh | 5 ++-
tests/gettext/gettext_potfiles.py | 65 ++++++++++++++++++++-------------------
tests/glade/run_glade_tests.sh | 5 ++-
tests/lib/filelist.py | 49 +++++++++++++++++++++++++++++
tests/lib/testlib.sh | 37 ++++++++++++++++++++++
tests/pylint/runpylint.sh | 17 +++++-----
7 files changed, 136 insertions(+), 43 deletions(-)
create mode 100644 tests/lib/filelist.py
create mode 100644 tests/lib/testlib.sh
--
1.9.0
10 years, 2 months
[PATCH] The custom spoke requires mountPointStore and mountPointCompletion, too.
by Chris Lumens
---
pyanaconda/ui/gui/spokes/custom.glade | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index e26129a..81938e9 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -3,6 +3,15 @@
<interface>
<!-- interface-requires gtk+ 3.2 -->
<!-- interface-requires AnacondaWidgets 1.0 -->
+ <object class="GtkListStore" id="mountPointStore">
+ <columns>
+ <!-- column-name path -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkEntryCompletion" id="mountPointCompletion">
+ <property name="model">mountPointStore</property>
+ </object>
<object class="AnacondaSpokeWindow" id="customStorageWindow">
<property name="can_focus">False</property>
<property name="events">GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
--
1.8.3.1
10 years, 2 months
[master/rhel7] driverdisk: Show selection menu for network driver isos (#1075918)
by Brian C. Lane
This shows the driver selection menu for network driver disks. It also
adds killing Plymouth which interferes with using the console, and
suppresses running the device selection menu when processing network
drivers since it will have been run earlier (at pre-trigger).
Resolves: rhbz#1075918
---
dracut/driver-updates | 11 +++++++----
dracut/driver-updates.sh | 1 -
dracut/driver-updates@.service | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dracut/driver-updates b/dracut/driver-updates
index 5f03f3b..876d32c 100755
--- a/dracut/driver-updates
+++ b/dracut/driver-updates
@@ -516,6 +516,8 @@ def select_drivers(drivers):
:type drivers: list of Driver objects
:returns: None
"""
+ if not drivers:
+ return
selection_menu(drivers, "Select drivers to install",
lambda driver: driver.source)
@@ -593,7 +595,7 @@ def network_driver(dd_path):
# TODO: May need to add new drivers to /tmp/dd_modules to prevent them from being unloaded
# Scan for new OEMDRV devices and ignore dd_args
- dd_scan(skip_dds, False)
+ dd_scan(skip_dds, scan_dd_args=False, skip_device_menu=True)
class DeviceInfo(object):
def __init__(self, **kwargs):
@@ -707,7 +709,7 @@ def select_iso():
return (os.path.join(mnt, dd_iso), "/media/DD-search")
-def dd_scan(skip_dds=set(), scan_dd_args=True):
+def dd_scan(skip_dds=set(), scan_dd_args=True, skip_device_menu=False):
""" Scan the system for OEMDRV devices and and specified by dd=/dev/<device>
:param skip_dds: devices to skip when checking for OEMDRV label
@@ -735,7 +737,7 @@ def dd_scan(skip_dds=set(), scan_dd_args=True):
skip_dds.update(dd_finished)
# Skip interactive selection of an iso if OEMDRV was found
- if skip_dds or not is_interactive():
+ if skip_dds or skip_device_menu or not is_interactive():
return
# Handle interactive driver selection
@@ -796,9 +798,10 @@ if __name__ == '__main__':
# process cmdline dd entries. This will process any OEMDRV that
# appear after loading the other drivers.
skip_dds = set(oemdrv_list())
- dd_scan(skip_dds)
+ dd_scan(skip_dds, skip_device_menu=True)
else:
# Process /tmp/dd_args and OEMDRV devices
+ # Show device selection menu when inst.dd passed and no OEMDRV devices
dd_scan()
sys.exit(0)
diff --git a/dracut/driver-updates.sh b/dracut/driver-updates.sh
index e2cc887..fca0b83 100755
--- a/dracut/driver-updates.sh
+++ b/dracut/driver-updates.sh
@@ -20,5 +20,4 @@ if [ -n "$dd_args" -o $blkid_rc -eq 0 ]; then
sleep 5
echo "$dd_args" > /tmp/dd_args
start_driver_update "Driver Update Disk"
- rm /tmp/dd_args
fi
diff --git a/dracut/driver-updates@.service b/dracut/driver-updates@.service
index 52cd6ca..210bcd5 100644
--- a/dracut/driver-updates@.service
+++ b/dracut/driver-updates@.service
@@ -8,6 +8,7 @@ Type=oneshot
RemainAfterExit=no
WorkingDirectory=/tmp
Environment=LANG=en_US.UTF-8
+ExecStartPre=-/bin/plymouth quit
ExecStart=/bin/driver-updates
StandardInput=tty-force
StandardOutput=inherit
--
1.8.5.3
10 years, 2 months
[master/rhel7 1/2] Append cmdline arg values in BootArgs (#1073130)
by Brian C. Lane
This creates a space separated list of the argument values when there is
more than one occurrence of a boot arg (eg. modprobe.blacklist can be
used multiple times). I did it this way instead of making a list
so that BootArgs users that don't have to check for list vs. string.
Related: rhbz#1073130
---
pyanaconda/flags.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
index 2cf7163..1435311 100644
--- a/pyanaconda/flags.py
+++ b/pyanaconda/flags.py
@@ -166,7 +166,11 @@ class BootArgs(OrderedDict):
key = i
val = None
- self[key] = val
+ # Duplicate args create a space separated string
+ if key in self:
+ self[key] = self[key] + " " + val
+ else:
+ self[key] = val
def getbool(self, arg, default=False):
"""
--
1.8.5.3
10 years, 2 months
[master] Enable tests in %check (#1075088)
by David Shea
This is a patch from atodorov to add a %check target. It copies a lot of what
were regular Requires into BuildRequires so that pylint and friends can be run,
so I don't know if that will make a mess of anything for bcl.
Alexander Todorov (1):
Enable make check in %check and add the necessary BuildRequires
anaconda.spec.in | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
--
1.8.5.3
10 years, 2 months
[PATCH] Add a setting to network.py that got left out of the cherry-pick.
by Chris Lumens
---
pyanaconda/ui/gui/spokes/network.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 96c19f5..595c90b 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -855,6 +855,7 @@ class NetworkControlBox(GObject.GObject):
vlanid = dev_cfg.device.get_vlan_id()
else:
vlanid = dev_cfg.setting_value("vlan", "id")
+ parent = dev_cfg.setting_value("vlan", "parent")
self._set_device_info_value("wired", "vlanid", str(vlanid))
self._set_device_info_value("wired", "parent", parent)
--
1.8.3.1
10 years, 2 months
[initial-setup][master] Import the product module (#1077390)
by Vratislav Podzimek
It is needed to set hub's title. Also remove an unused import.
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
initial_setup/gui/hubs/initial_setup_hub.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/initial_setup/gui/hubs/initial_setup_hub.py b/initial_setup/gui/hubs/initial_setup_hub.py
index 976590a..6041367 100644
--- a/initial_setup/gui/hubs/initial_setup_hub.py
+++ b/initial_setup/gui/hubs/initial_setup_hub.py
@@ -2,7 +2,7 @@ from pyanaconda.constants import FIRSTBOOT_ENVIRON
from pyanaconda.ui.gui.hubs import Hub
from pyanaconda.ui.gui.spokes import Spoke
from pyanaconda.ui.common import collect
-import os
+from initial_setup import product
__all__ = ["InitialSetupMainHub"]
--
1.8.5.3
10 years, 2 months
[master][PATCH] Move libtimezonemap requires to the anaconda-gui subpackage
by Vratislav Podzimek
It is not required by the core and tui packages.
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
anaconda.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index c37e49f..c3ee590 100755
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -114,7 +114,6 @@ Requires: python-nss
Requires: pytz
Requires: realmd
Requires: teamd
-Requires: libtimezonemap >= %{libtimezonemapver}
%ifarch %livearches
Requires: usermode
%endif
@@ -168,6 +167,7 @@ Requires: system-logos
Requires: tigervnc-server-minimal
Requires: libxklavier >= %{libxklavierver}
Requires: libgnomekbd
+Requires: libtimezonemap >= %{libtimezonemapver}
Requires: nm-connection-editor
%ifarch %livearches
Requires: zenity
--
1.8.5.3
10 years, 2 months