We don't try to make xfs filesystems on the livecd because the tools
aren't there, but we still try to label already existing ones. We
should stop doing that.

- Chris


diff --git a/fsset.py b/fsset.py
index 40eb0d2..e216d9a 100644
--- a/fsset.py
+++ b/fsset.py
@@ -381,7 +381,7 @@ class xfsFileSystem(FileSystemType):
self.maxSizeMB = 16 * 1024 * 1024
self.maxLabelChars = 12
self.supported = -1
- if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs"):
+ if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/xfs_admin"):
self.supported = 0

self.packages = [ "xfsprogs" ]
@@ -1874,9 +1874,10 @@ MAILADDR root
label = isys.readFSLabel(dev)
except:
continue
+
if label:
entry.setLabel(label)
- else:
+ elif entry.fsystem.isSupported():
self.labelEntry(entry, chroot)

def haveMigratedFilesystems(self):

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

Chris Lumens wrote:
> We don't try to make xfs filesystems on the livecd because the tools
> aren't there, but we still try to label already existing ones. We
> should stop doing that.
>
> - Chris
>
>
> diff --git a/fsset.py b/fsset.py
> index 40eb0d2..e216d9a 100644
> --- a/fsset.py
> +++ b/fsset.py
> @@ -381,7 +381,7 @@ class xfsFileSystem(FileSystemType):
> self.maxSizeMB = 16 * 1024 * 1024
> self.maxLabelChars = 12
> self.supported = -1
> - if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs"):
> + if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/xfs_admin"):

If you want to make that line any shorter, mkfs.xfs should always exist
in /sbin, not /usr/sbin, just FWIW.

-Eric

> self.supported = 0
>
> self.packages = [ "xfsprogs" ]
> @@ -1874,9 +1874,10 @@ MAILADDR root
> label = isys.readFSLabel(dev)
> except:
> continue
> +
> if label:
> entry.setLabel(label)
> - else:
> + elif entry.fsystem.isSupported():
> self.labelEntry(entry, chroot)
>
> def haveMigratedFilesystems(self):
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@redhat.com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

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

> > diff --git a/fsset.py b/fsset.py
> > index 40eb0d2..e216d9a 100644
> > --- a/fsset.py
> > +++ b/fsset.py
> > @@ -381,7 +381,7 @@ class xfsFileSystem(FileSystemType):
> > self.maxSizeMB = 16 * 1024 * 1024
> > self.maxLabelChars = 12
> > self.supported = -1
> > - if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs"):
> > + if not os.path.exists("/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/mkfs.xfs") and not os.path.exists("/usr/sbin/xfs_admin"):
>
> If you want to make that line any shorter, mkfs.xfs should always exist
> in /sbin, not /usr/sbin, just FWIW.

We do this same sort of thing several places in anaconda. It's probably
in there because of how we move things around in upd-instroot, and no
one can remember where binaries are vs. where binaries are supposed to
be.

- Chris

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