summaryrefslogtreecommitdiffstats
path: root/fsset.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-04-17 21:29:32 +0000
committerChris Lumens <clumens@redhat.com>2007-04-17 21:29:32 +0000
commitfc4aa5170853e71bd0006268ad8b47a6d6d49846 (patch)
tree90b8c6d6f0e6f61ff7ef6a3ab1b89d148beecc0f /fsset.py
parentd472197f9a4fc3bc12eaadb2fa08f541873e7751 (diff)
downloadanaconda-fc4aa5170853e71bd0006268ad8b47a6d6d49846.tar.gz
anaconda-fc4aa5170853e71bd0006268ad8b47a6d6d49846.tar.xz
anaconda-fc4aa5170853e71bd0006268ad8b47a6d6d49846.zip
Print a better error message when devices are mentioned by name instead of by
label and we can't mount them.
Diffstat (limited to 'fsset.py')
-rw-r--r--fsset.py26
1 files changed, 17 insertions, 9 deletions
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)