[RHEL 7.2/PATCH] Cancel Container Edit Sensitizes Update (#1168656)
by Robert Marshall
The "Update Settings" button in the custom partition screen would
activate after a user attempted to create a new volume and then
pressed the cancel button. This patch removes the double event
handler which had the unintended side effect of setting the
sensitive property to True no matter what happened in the
container editor dialog box.
Resolves: rhbz#1168656
---
pyanaconda/ui/gui/spokes/custom.glade | 1 -
pyanaconda/ui/gui/spokes/custom.py | 12 +++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 2cf6e70..8407dda 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -815,7 +815,6 @@
<property name="can_focus">False</property>
<property name="model">containerStore</property>
<signal name="changed" handler="on_container_changed" swapped="no"/>
- <signal name="changed" handler="on_value_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="descRenderer"/>
<attributes>
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 8ee545d..c80e4ab 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -2085,13 +2085,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
container_type = get_container_type_name(device_type).lower()
new_text = _(NEW_CONTAINER_TEXT) % {"container_type": container_type}
create_new_container = container_name == new_text
+ user_changed_container = True
if create_new_container:
# run the vg editor dialog with a default name and disk set
hostname = self.data.network.hostname
name = self._storage_playground.suggestContainerName(hostname=hostname)
- new = self.run_container_editor(name=name)
+ # user_changed_container flips to False if "cancel" picked
+ user_changed_container = self.run_container_editor(name=name)
for idx, data in enumerate(self._containerStore):
- if new and data[0] == new_text:
+ if user_changed_container and data[0] == new_text:
c = self._storage_playground.devicetree.getDeviceByName(self._device_container_name)
freeSpace = getattr(c, "freeSpace", None)
row = self._container_store_row(self._device_container_name, freeSpace)
@@ -2099,11 +2101,15 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
self._containerStore.insert(idx, row)
combo.set_active(idx) # triggers a call to this method
return
- elif not new and data[0] == self._device_container_name:
+ elif not user_changed_container and data[0] == self._device_container_name:
combo.set_active(idx)
return
+ # else clause runs if an already existing container is picked
else:
self._device_container_name = container_name
+
+ if user_changed_container:
+ self._applyButton.set_sensitive(True)
container = self._storage_playground.devicetree.getDeviceByName(self._device_container_name)
container_exists = getattr(container, "exists", False) # might not be in the tree
--
2.4.3
9 years
[PATCH rhel7-branch] Use the RHEL7 versions of certain partitioning commands.
by Chris Lumens
With the changes to pykickstart for supporting --mkfsoptions, we need to
make sure anaconda is using the latest versions of those commands. This
does not add support to anaconda for the --mkfsoptions argument, it merely
allows tests to continue passing.
Related: rhbz#1217110
---
pyanaconda/kickstart.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index d587976..5cccb5e 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -423,12 +423,12 @@ class Bootloader(commands.bootloader.RHEL7_Bootloader):
if self.nombr:
flags.nombr = True
-class BTRFS(commands.btrfs.F17_BTRFS):
+class BTRFS(commands.btrfs.RHEL7_BTRFS):
def execute(self, storage, ksdata, instClass):
for b in self.btrfsList:
b.execute(storage, ksdata, instClass)
-class BTRFSData(commands.btrfs.F17_BTRFSData):
+class BTRFSData(commands.btrfs.RHEL7_BTRFSData):
def execute(self, storage, ksdata, instClass):
devicetree = storage.devicetree
@@ -1067,7 +1067,7 @@ class DmRaid(commands.dmraid.FC6_DmRaid):
def parse(self, args):
raise NotImplementedError(_("The %s kickstart command is not currently supported.") % "dmraid")
-class Partition(commands.partition.F20_Partition):
+class Partition(commands.partition.RHEL7_Partition):
def execute(self, storage, ksdata, instClass):
for p in self.partitions:
p.execute(storage, ksdata, instClass)
@@ -1075,7 +1075,7 @@ class Partition(commands.partition.F20_Partition):
if self.partitions:
doPartitioning(storage)
-class PartitionData(commands.partition.F18_PartData):
+class PartitionData(commands.partition.RHEL7_PartData):
def execute(self, storage, ksdata, instClass):
devicetree = storage.devicetree
kwargs = {}
@@ -1336,12 +1336,12 @@ class PartitionData(commands.partition.F18_PartData):
parents=request)
storage.createDevice(luksdev)
-class Raid(commands.raid.F20_Raid):
+class Raid(commands.raid.RHEL7_Raid):
def execute(self, storage, ksdata, instClass):
for r in self.raidList:
r.execute(storage, ksdata, instClass)
-class RaidData(commands.raid.F18_RaidData):
+class RaidData(commands.raid.RHEL7_RaidData):
def execute(self, storage, ksdata, instClass):
raidmems = []
devicetree = storage.devicetree
--
2.4.3
9 years
[rhel6-branch] Include drbg module in the initrd. (#1233088)
by Samantha N. Bueno
Apparently it is suddenly necessary that this module is present in
order for cryptsetup to work.
Resolves: rhbz#1233088
---
scripts/mk-images | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/mk-images b/scripts/mk-images
index f7b2c29..b565c65 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -109,7 +109,7 @@ SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft scsi_wait_scan cxgb3
FSMODS="fat msdos vfat ext2 ext3 ext4 reiserfs jfs xfs gfs2 cifs fuse btrfs hfsplus xenfs"
LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-crypt dm-raid dm-raid45 dm-memcache dm-thin-pool"
RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear"
-CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4"
+CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4 drbg"
PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia"
INFINIBANDMODS="ib_qib mlx4_ib"
VMPVMODS="vmxnet3 vmware_balloon vmw_pvsci"
--
1.9.3
9 years