This patches against anaconda-storage-branch get me to
package installation (with Custom non-lvm partitioning).
They fix 4 tracebacks i met on the way there.
(applied to 4fb446e75fbc7e10621896ea10660cbb2ca8cfda)
---
storage/__init__.py | 6 +++---
storage/devices.py | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/storage/__init__.py b/storage/__init__.py
index 524d3c2..947b0d4 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -696,7 +696,7 @@ class Storage(object):
uses_usb = False
uses_firewire = False
- for device in filesystems.values()
+ for device in filesystems.values():
for disk in usb_disks:
if device.dependsOn(disk):
uses_usb = True
@@ -739,7 +739,7 @@ class Storage(object):
"filesystem.") % boot.format.name)
# vfat /boot is insane.
- if (boot and boot == rootDevice and boot.format.type == "vfat"):
+ if (boot and boot == root and boot.format.type == "vfat"):
errors.append(_("Bootable partitions cannot be on an %s "
"filesystem.") % boot.format.type)
@@ -748,7 +748,7 @@ class Storage(object):
errors.append(_("Bootable partitions cannot be on an "
"encrypted block device"))
- if not swapDevices:
+ if not swaps:
warnings.append(_("You have not specified a swap partition. "
"Although not strictly required in all cases, "
"it will significantly improve performance for "
diff --git a/storage/devices.py b/storage/devices.py
index 27d9a1f..14fbb11 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -594,7 +594,6 @@ class DiskDevice(StorageDevice):
self.partedDevice = None
self.partedDisk = None
- self.removable = False
log.debug("looking up parted Device: %s" % self.path)
self.partedDevice = parted.Device(path=self.path)
if not self.partedDevice:
--
1.5.4.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
