[anaconda:rhel7/master] Check RAID10 box for BTRFS (#1021856)
by Anne Mulhern
Resolves: rhbz#1021856
Note: I edited this by hand rather than through glade because if I edit
it through glade none of the values are visible, i.e., editing through glade
causes a bug.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
pyanaconda/ui/gui/spokes/custom.glade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 8d014c0..c5686e1 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -2232,7 +2232,7 @@ until you click on the main menu's 'Begin Installation' button.</property>
<col id="0" translatable="yes">RAID10 <span foreground="grey">(Performance, Redundancy)</span></col>
<col id="1">False</col>
<col id="2">True</col>
- <col id="3">False</col>
+ <col id="3">True</col>
<col id="4">True</col>
</row>
</data>
--
1.8.3.1
10 years, 2 months
[PATCH] various patches
by Chris Lumens
#1-3 are all against RHEL7, but of those only #2 needs to go to rhel7-branch
right now. I suppose the others could in the future. #4 fixes a pylint
caught problem.
- Chris
10 years, 2 months
[blivet:rhel7/master] Don't add None value to req_disks (#981316)
by Anne Mulhern
Resolves: rhbz#981316
If a disk has been removed in the interim it won't be found by a lookup
in the device tree, but we don't want to include None in our copy.
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/__init__.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index 1f6637f..1236511 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -1961,11 +1961,8 @@ class Blivet(object):
continue
# update the refs in req_disks as well
- req_disks = []
- for disk in partition.req_disks:
- req_disks.append(new.devicetree.getDeviceByID(disk.id))
-
- partition.req_disks = req_disks
+ req_disks = (new.devicetree.getDeviceByID(disk.id) for disk in partition.req_disks)
+ partition.req_disks = [disk for disk in req_disks if disk is not None]
p = partition.disk.format.partedDisk.getPartitionByPath(partition.path)
partition.partedPartition = p
--
1.8.3.1
10 years, 2 months
[blivet:rhel7/master] Make error message more informative (#1022497)
by Anne Mulhern
Resolves: rhbz#1022497
Make the error message indicate the nature of the problem a little better so
that it is less misleading when it pops up in the GUI.
Making the error message indicate the precise problem is actually kind of
tricky, since it would involve changing the return values for
getNextPartitionType() to record this information
and then propagating those values carefully througout
a large chunk of allocatePartitions().
Signed-off-by: mulhern <amulhern(a)redhat.com>
---
blivet/partitioning.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blivet/partitioning.py b/blivet/partitioning.py
index abaf1b3..33bda27 100644
--- a/blivet/partitioning.py
+++ b/blivet/partitioning.py
@@ -1064,7 +1064,7 @@ def allocatePartitions(storage, disks, partitions, freespace):
break
if free is None:
- raise PartitioningError(_("not enough free space on disks"))
+ raise PartitioningError(_("unable to allocate a large enough partition"))
_disk = use_disk
disklabel = _disk.format
--
1.8.3.1
10 years, 2 months