[anaconda:rhel7/master 0/2] #1076055 patches
by Anne Mulhern
These patches are both optional assuming the blivet patch is correct.
The first is almost independent, and fixes a small bug that omitted
to check whether maxSize was 0 (indicating no maxSize).
The other makes use_dev a little less used in _save_right_side as
part of an overall goal of handling these kinds of distinctions in
blivet wherever that is appropriate.
mulhern (2):
Handle case where device.maxSize is 0 differently (#1076055)
Make resizable and exists based on device, not use_dev (#1076055)
pyanaconda/ui/gui/spokes/custom.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
--
1.9.3
9 years, 9 months
[blivet:rhel7-only] Convert devices size to str for GUI for zFCP devices (#1144464)
by Anne Mulhern
Resolves: rhbz#1144464
Should have gone in with b3f4bcfbd5799d47b65dfee15a34d09bca11ff83.
Sizes for all other device types were properly converted in this commit,
but zFCP devices got left out.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
pyanaconda/ui/gui/spokes/filter.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/filter.py b/pyanaconda/ui/gui/spokes/filter.py
index 2ffbe23..66dcc94 100644
--- a/pyanaconda/ui/gui/spokes/filter.py
+++ b/pyanaconda/ui/gui/spokes/filter.py
@@ -470,7 +470,7 @@ class ZPage(FilterPage):
# now add it to our store
store.append([True, selected, not disk.protected,
- disk.name, "", disk.model, disk.size,
+ disk.name, "", disk.model, str(disk.size),
disk.vendor, disk.bus, disk.serial, "", "\n".join(paths),
"", "", disk.fcp_lun, disk.hba_id, disk.wwpn])
--
1.9.3
9 years, 9 months
[master/rhel7-branch] Fix string formatting of zFCP devices (#1024902)
by Samantha N. Bueno
Related: rhbz#1024902
---
pyanaconda/ui/gui/spokes/storage.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index 7365f28..b90006b 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -606,7 +606,8 @@ class StorageSpoke(NormalSpoke, StorageChecker):
elif isinstance(disk, ZFCPDiskDevice):
# manually mangle the desc of a zFCP device to be multi-line since
# it's so long it makes the disk selection screen look odd
- description = _("FCP device %s\nWWPN %s\nLUN %s" % (disk.hba_id, disk.wwpn, disk.fcp_lun))
+ description = _("FCP device %(hba_id)s\nWWPN %(wwpn)s\nLUN %(lun)s") % \
+ {"hba_id": disk.hba_id, "wwpn": disk.wwpn, "lun": disk.fcp_lun}
else:
description = disk.description
--
1.9.3
9 years, 9 months
[master/rhel7-branch] fix handling of logvol --percent (#1116435)
by David Lehman
Originally, logvol --percent specified a fixed size as a portion of
the vg's free space. When I rewrote storage for F11, I broke that.
Apparently it sees limited usage.
The way it works now (broken) is the percentage specifies how much to
grow the request, which means you also have to provide a base size and
indicate that the request is growable. This is not especially useful IMO.
It's complicated conceptually and awkward in general.
The new/oldest way is to treat the percentage as a fixed size for the
request based on the free space in the vg. Nice and easy to use. Requests
with percentage-based sizes can also be growable -- the request-growing
code makes no distinction between requests with percentage-based sizes
and those defined with literal sizes.
I'll propose this for f21 when I'm doing bugzilla work tomorrow.
9 years, 9 months
[master/rhel7-branch] Fix the way zFCP devices are displayed in storage spoke. (#1024902)
by Samantha N. Bueno
This basically makes this hideous display:
https://sbueno.fedorapeople.org/1024902-orig.png
Look less hideous:
https://sbueno.fedorapeople.org/1024902-centered.jpg
More broadly, disk descriptions are now center-aligned (I believe
the prior/default alignment was justified).
Resolves: rhbz#1024902
---
pyanaconda/ui/gui/spokes/storage.py | 6 +++++-
widgets/src/DiskOverview.c | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index d597173..7365f28 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -57,7 +57,7 @@ from pyanaconda.ui.gui.utils import enlightbox, gtk_call_once, gtk_action_wait,
from pyanaconda.kickstart import doKickstartStorage, getAvailableDiskSpace
from blivet import storageInitialize, arch
from blivet.size import Size
-from blivet.devices import MultipathDevice
+from blivet.devices import MultipathDevice, ZFCPDiskDevice
from blivet.errors import StorageError, DasdFormatError
from blivet.errors import SanityError
from blivet.errors import SanityWarning
@@ -603,6 +603,10 @@ class StorageSpoke(NormalSpoke, StorageChecker):
if isinstance(disk, MultipathDevice):
desc = disk.wwid.split(":")
description = ":".join(desc[0:3]) + "..." + ":".join(desc[-4:])
+ elif isinstance(disk, ZFCPDiskDevice):
+ # manually mangle the desc of a zFCP device to be multi-line since
+ # it's so long it makes the disk selection screen look odd
+ description = _("FCP device %s\nWWPN %s\nLUN %s" % (disk.hba_id, disk.wwpn, disk.fcp_lun))
else:
description = disk.description
diff --git a/widgets/src/DiskOverview.c b/widgets/src/DiskOverview.c
index ebb47e8..908a378 100644
--- a/widgets/src/DiskOverview.c
+++ b/widgets/src/DiskOverview.c
@@ -395,6 +395,7 @@ static void anaconda_disk_overview_set_property(GObject *object, guint prop_id,
char *markup = g_markup_printf_escaped("<span weight='bold' size='large'>%s</span>", g_value_get_string(value));
gtk_label_set_markup(GTK_LABEL(priv->description_label), markup);
g_free(markup);
+ gtk_label_set_justify(GTK_LABEL(priv->description_label), GTK_JUSTIFY_CENTER);
break;
}
--
1.9.3
9 years, 9 months
[rhel7-branch ONLY] Fix for the problems with X/Gdk/Gtk on rhel7-branch
by Vratislav Podzimek
The PATCH 2/2 is the missing piece that has to go along with moving our
interfaces into separate subpackages. Otherwise weird things happen with the
X/Gdk/Gtk although it is interesting that different things happened on master
before the PATCH 2/2 was applied.
Chris Lumens (1):
Change how we test if the GUI is available in the anaconda script.
Vratislav Podzimek (1):
Revert "Don't call BusyCursor before Gdk is setup (#1078868)"
anaconda | 9 +++++----
pyanaconda/ui/gui/__init__.py | 2 ++
pyanaconda/ui/gui/utils.py | 6 ------
3 files changed, 7 insertions(+), 10 deletions(-)
--
1.9.3
9 years, 9 months
[PATCH 1/5] Ok -> OK on the proxy dialog.
by Chris Lumens
We use OK everywhere else.
---
pyanaconda/ui/gui/spokes/source.glade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade
index 1abdcf1..54c85fb 100644
--- a/pyanaconda/ui/gui/spokes/source.glade
+++ b/pyanaconda/ui/gui/spokes/source.glade
@@ -238,7 +238,7 @@
</child>
<child>
<object class="GtkButton" id="proxyOkButton">
- <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_Ok</property>
+ <property name="label" translatable="yes" context="GUI|Software Source|Proxy Dialog">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
--
1.9.3
9 years, 9 months
[rhel7/master] Don't call BusyCursor before Gdk is setup (#1078868)
by Brian C. Lane
The setup method is too early, the Gdk.get_default_root_window call
fails. So Remove the call to busyCursor, but just in case also silently
return if busyCursor or unbusyCursor doesn't get a window.
---
pyanaconda/ui/gui/__init__.py | 2 --
pyanaconda/ui/gui/utils.py | 6 ++++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index b64d983..efd3400 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -301,8 +301,6 @@ class GraphicalUserInterface(UserInterface):
return isinstance(obj, StandaloneSpoke)
def setup(self, data):
- busyCursor()
-
self._actions = self.getActionClasses(self._list_hubs())
self.data = data
diff --git a/pyanaconda/ui/gui/utils.py b/pyanaconda/ui/gui/utils.py
index c0682ea..c4fd214 100644
--- a/pyanaconda/ui/gui/utils.py
+++ b/pyanaconda/ui/gui/utils.py
@@ -175,10 +175,16 @@ def timed_action(delay=300, threshold=750, busy_cursor=True):
def busyCursor():
window = Gdk.get_default_root_window()
+ if not window:
+ return
+
window.set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
def unbusyCursor():
window = Gdk.get_default_root_window()
+ if not window:
+ return
+
window.set_cursor(Gdk.Cursor(Gdk.CursorType.ARROW))
@contextmanager
--
1.9.3
9 years, 9 months
[rhel7/master] Don't call storage.write for dirinstall (#1120206)
by Brian C. Lane
The logic got slightly corrupted with the ostree patches. With this fix
you can do:
anaconda --text --dirinstall --kickstart=./path/to/ks.cfg
to get an installed system in /mnt/sysimage/
Related: rhbz#1120206
---
pyanaconda/install.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index 3c6bbc9..6b2bef6 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -183,9 +183,8 @@ def doInstall(storage, payload, ksdata, instClass):
turnOnFilesystems(storage, mountOnly=flags.flags.dirInstall)
write_storage_late = (flags.flags.livecdInstall or ksdata.ostreesetup.seen
- or ksdata.method.method == "liveimg"
- and not flags.flags.dirInstall)
- if not write_storage_late:
+ or ksdata.method.method == "liveimg")
+ if not write_storage_late and not flags.flags.dirInstall:
storage.write()
# Do packaging.
@@ -214,7 +213,7 @@ def doInstall(storage, payload, ksdata, instClass):
payload.preInstall(packages=packages, groups=payload.languageGroups())
payload.install()
- if write_storage_late:
+ if write_storage_late and not flags.flags.dirInstall:
if iutil.getSysroot() != iutil.getTargetPhysicalRoot():
blivet.setSysroot(iutil.getTargetPhysicalRoot(),
iutil.getSysroot())
--
1.9.3
9 years, 9 months
[blivet][master/rhel7-branch] 7.1 low-hanging fruit
by David Lehman
Patch 3 is sort of in flux. The patch makes blivet behave the way the
install guide says it behaves (percent indicates an amount of growth as
a percentage of vg free space after allocating base requests), but I
would prefer to change both the code and the docs to match the rhel5
behavior (percent indicates a fixed size expressed as percentage of vg
free space after allocating base requests). Feedback would be appreciated.
Patch 8 feels a bit dirty to me, but it does provide a way for users to
specify arbitrary btrfs mount options via kickstart.
David Lehman (8):
Set dummy mountpoint in ksdata for lvm thin pools.
Improve adjustment for removal of a subvol in BTRFSFactory.
Fix basis for precentage growth of lvm requests.
Increase max size for btrfs to 16 EiB. (#1114435)
Reset default subvolume prior to removing the default subvolume.
Do not mount btrfs to list subvolumes outside installer_mode.
Properly identify dm devices even when udev info is incomplete.
Propagate mount options for btrfs members to all volumes/subvolumes.
blivet/devicefactory.py | 7 +++++--
blivet/devicelibs/btrfs.py | 7 +++++++
blivet/devices.py | 49 +++++++++++++++++++++++++++++++++++++++++-----
blivet/formats/fs.py | 2 +-
blivet/partitioning.py | 3 ++-
blivet/udev.py | 3 ++-
6 files changed, 61 insertions(+), 10 deletions(-)
--
1.9.3
9 years, 9 months