--- pyanaconda/ui/gui/spokes/storage.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 6bd71ec..ae7b419 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -150,8 +150,7 @@ class InstallOptions1Dialog(GUIObject):
options_text = (_("You have plenty of space to install <b>%s</b>, so " "we can automatically\n" - "configure the rest of the installation for you.\n\n" - "You're all set!") + "configure the rest of the installation for you.") % productName) options_label.set_markup(options_text)
Reformat being sensitive shouldn't have anything to do with it. If we are forcing the user the reformat a filesystem, they should be able to pick what it's being reformatted with. --- pyanaconda/ui/gui/spokes/custom.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 78047a9..3c5aa7c 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -1597,8 +1597,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): device.originalFormat.type not in self._fs_types: fsCombo.append_text(device.originalFormat.name)
- fsCombo.set_sensitive(self._reformatCheckbox.get_sensitive() and - self._reformatCheckbox.get_active()) + fsCombo.set_sensitive(self._reformatCheckbox.get_active())
## ## Set up the device type combo. @@ -2407,8 +2406,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): active_index = len(fsCombo.get_model()) - 1
fsCombo.set_active(active_index) - fsCombo.set_sensitive(self._reformatCheckbox.get_sensitive() and - self._reformatCheckbox.get_active() and + fsCombo.set_sensitive(self._reformatCheckbox.get_active() and fs_type_sensitive) # end btrfs magic
--- pyanaconda/storage/devices.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index 07387c4..b879262 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -4120,7 +4120,7 @@ class BTRFSVolumeDevice(BTRFSDevice): for name, subvol in self.subvolumes: if subvol.exists: continue - subvolume.create(mountpoint=self._temp_dir_prefix) + subvol.create(mountpoint=self._temp_dir_prefix) self._undo_temp_mount()
def removeSubVolume(self, name):
--- pyanaconda/storage/__init__.py | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index f76a7b4..8c7319c 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -186,25 +186,12 @@ def turnOnFilesystems(storage): except Exception as e: raise
- if not upgrade: - storage.turnOnSwap() - # FIXME: For livecd, skipRoot needs to be True. - storage.mountFilesystems(raiseErrors=False, - readOnly=False, - skipRoot=False) - writeEscrowPackets(storage) - else: - if upgrade_migrate: - # we should write out a new fstab with the migrated fstype - shutil.copyfile("%s/etc/fstab" % ROOT_PATH, - "%s/etc/fstab.anaconda" % ROOT_PATH) - storage.fsset.write() - - # and make sure /dev is mounted so we can read the bootloader - getFormat("bind", - device="/dev", - mountpoint="/dev", - exists=True).mount(chroot=ROOT_PATH) + storage.turnOnSwap() + # FIXME: For livecd, skipRoot needs to be True. + storage.mountFilesystems(raiseErrors=False, + readOnly=False, + skipRoot=False) + writeEscrowPackets(storage)
def writeEscrowPackets(storage): escrowDevices = filter(lambda d: d.format.type == "luks" and \ @@ -833,7 +820,7 @@ class Storage(object): if disk.format.labelType in magic_partitions: number = magic_partitions[disk.format.labelType] # remove the magic partition - for part in storage.partitions: + for part in disk.format.partitions: if part.disk == disk and part.partedPartition.number == number: log.debug("removing %s" % part.name) # We can't schedule the magic partition for removal @@ -2875,7 +2862,7 @@ class FSSet(object):
try: device.setup() - except Exception as msg: + except Exception as e: if errorHandler.cb(e, device) == ERROR_RAISE: raise else:
Ack to all these. cherry-pick to f18-branch where appropriate, I'll do a build later.
I git am'd these to master and f18-branch, they looked serious enough that they'd get turned into blockers.
On Mon, Dec 17, 2012 at 11:23:04AM -0500, Chris Lumens wrote:
I git am'd these to master and f18-branch, they looked serious enough that they'd get turned into blockers.
Patch #1 should not have been picked to the branch.
Oops, I can revert in the next build.
anaconda-patches@lists.fedorahosted.org
-
Brian C. Lane -
Chris Lumens