Print a better error message when devices are mentioned by name instead of by

label and we can't mount them.

2 files changed, 21 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 3dca20714..16e813aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@
 	libata, default to writing out a new bootloader config and take away
 	the update option (#229704).
 
+	* fsset.py (FileSystemSet.mountFilesystems):  Print a better error
+	message when devices are mentioned by name instead of by label and we
+	can't mount them.
+
 2007-04-17  Paul Nasrat <pnasrat@redhat.com>
 
 	* isys/isys.py: Ignore ps3 flash (#236481)
diff --git a/fsset.py b/fsset.py
index 71f2dc815..7fc3d6a1b 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1715,15 +1715,23 @@ MAILADDR root
                         else:
                             continue
                     else:
-                        self.messageWindow(_("Error"), 
-                                           _("Error mounting device %s as %s: "
-                                             "%s\n\n"
-                                             "This most likely means this "
-                                             "partition has not been formatted."
-                                             "\n\n"
-                                             "Press OK to reboot your system.")
-                                           % (entry.device.getDevice(),
-                                              entry.mountpoint, msg))
+                        if anaconda.id.getUpgrade() and not entry.getLabel():
+                            errStr = _("Error mounting device %s as %s: "
+                                       "%s\n\n"
+                                       "Devices in /etc/fstab should be "
+                                       "specified by label, not by device name."
+                                       "\n\n"
+                                       "Press OK to reboot your system.") % (entry.device.getDevice(), entry.mountpoint, msg)
+                        else:
+                            errStr = _("Error mounting device %s as %s: "
+                                       "%s\n\n"
+                                       "This most likely means this "
+                                       "partition has not been formatted."
+                                       "\n\n"
+                                       "Press OK to reboot your system.") % (entry.device.getDevice(), entry.mountpoint, msg)
+
+                        self.messageWindow(_("Error"), errStr)
+
                 sys.exit(0)
 
         self.makeLVMNodes(anaconda.rootPath)