handle labels even on the not formatting case (#52544)

1 files changed, 13 insertions, 0 deletions

diff --git a/fsset.py b/fsset.py
index 9aa591d41..21cbc580a 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1004,9 +1004,11 @@ class FileSystemSet:
 
     def makeFilesystems (self, chroot='/'):
         formatted = []
+        notformatted = []
         for entry in self.entries:
             if (not entry.fsystem.isFormattable() or not entry.getFormat()
                 or entry.isMounted()):
+                notformatted.append(entry)
                 continue
             try:
                 self.formatEntry(entry, chroot)
@@ -1029,6 +1031,17 @@ class FileSystemSet:
                 # should be OK, we'll still use the device name to mount.
                 pass
 
+        # go through and have labels for the ones we don't format
+        for entry in notformatted:
+            dev = entry.device.getDevice()
+            if not dev or dev == "none":
+                continue
+            label = isys.readExt2Label(dev)
+            if label:
+                entry.setLabel(label)
+            else:
+                self.labelEntry(entry, chroot)
+
     def haveMigratedFilesystems(self):
         return self.migratedfs