Re: [PATCH] Handle rootPath referencing a chroot value or actual path (#519665)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wed, 2 Sep 2009, David Cantrell wrote:

Still related to #519665, but account for anaconda.rootPath containing
the chroot value passed to the mount() method on the format.  But for
install types as indicated in the bug, rootPath will be the actual path.
---
storage/__init__.py |   20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/storage/__init__.py b/storage/__init__.py
index 81dd06d..ba20483 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -1763,19 +1763,15 @@ class FSSet(object):

    @property
    def rootDevice(self):
-        rootpath = self.rootpath
-
-        if not rootpath:
-            rootpath = "/"
-
-        for device in self.devices:
-            try:
-                mountpoint = device.format.mountpoint
-            except AttributeError:
-                mountpoint = None
+        for path in ["/", self.rootpath]:
+            for device in self.devices:
+                try:
+                    mountpoint = device.format.mountpoint
+                except AttributeError:
+                    mountpoint = None

-            if mountpoint == rootpath:
-                return device
+                if mountpoint == "/":

This line should actually be:

                   if mountpoint == path:

+                    return device

    @property
    def migratableDevices(self):


- -- David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkqfHj0ACgkQ5hsjjIy1Vkn6xwCfdgAXrArAgXcdbSxQMzZgoH/1
beoAnRvG3qy+JJipL4hCqQHiiS0JrAve
=axcS
-----END PGP SIGNATURE-----

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux