Patch 1, combined with the lorax patch I just sent, enables ntfs resize.
Patch 2 fixes a traceback on upgrade for systems that have at least one device in /etc/fstab that does not contain the root filesystem and also requires activation (eg: md or lvm).
--- pyanaconda/storage/formats/fs.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/storage/formats/fs.py b/pyanaconda/storage/formats/fs.py index c47f4c3..a9abe1a 100644 --- a/pyanaconda/storage/formats/fs.py +++ b/pyanaconda/storage/formats/fs.py @@ -152,7 +152,7 @@ class FS(DeviceFormat): self._size = kwargs.get("size", 0) self._minInstanceSize = None # min size of this FS instance self._mountpoint = None # the current mountpoint when mounted - if self.exists and self.supported: + if self.exists: self._size = self._getExistingSize() foo = self.minSize # force calculation of minimum size
@@ -254,7 +254,8 @@ class FS(DeviceFormat): """ size = self._size
- if self.infofsProg and self.exists and not size: + if self.infofsProg and self.exists and not size and \ + iutil.find_program_in_path(self.infofsProg): try: values = [] argv = self._defaultInfoOptions + [ self.device ]
Any non-root device that appears in /etc/fstab and requires activation (eg: lvm, md) must be active prior to instantiating an FS instance for an existing filesystem on that device due to current/minimum size calculations triggered by the FS constructor. --- pyanaconda/storage/__init__.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index 8483eca..5b278ff 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -2004,10 +2004,12 @@ class FSSet(object): fstype)) raise UnrecognizedFSTabEntryError()
+ device.setup() fmt = getFormat(fstype, device=device.path, exists=True) if fstype != "auto" and None in (device.format.type, fmt.type): log.info("Unrecognized filesystem type for %s (%s)" % (device.name, fstype)) + device.teardown() raise UnrecognizedFSTabEntryError()
# make sure, if we're using a device from the tree, that @@ -2020,6 +2022,7 @@ class FSSet(object): # XXX we should probably disallow migration for this fs device.format = fmt else: + device.teardown() raise FSTabTypeMismatchError("%s: detected as %s, fstab says %s" % (mountpoint, dtype, ftype)) del ftype
On Tue, May 01, 2012 at 11:25:31AM -0500, David Lehman wrote:
Patch 1, combined with the lorax patch I just sent, enables ntfs resize.
Patch 2 fixes a traceback on upgrade for systems that have at least one device in /etc/fstab that does not contain the root filesystem and also requires activation (eg: md or lvm).
Anaconda-devel-list mailing list Anaconda-devel-list@redhat.com https://www.redhat.com/mailman/listinfo/anaconda-devel-list
Ack to both of those
anaconda-devel@lists.stg.fedoraproject.org
-
Brian C. Lane -
David Lehman