summaryrefslogtreecommitdiffstats
path: root/fsset.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-06-03 20:47:28 +0000
committerJeremy Katz <katzj@redhat.com>2002-06-03 20:47:28 +0000
commit8c9df7368c5ad1c30da521bd6464645ada6f7dd8 (patch)
tree6dd93416fbd06af049e50a65c9508a9405d15fb3 /fsset.py
parentfb995077a9469c8ff799497b6ff0b59b8f138571 (diff)
downloadanaconda-8c9df7368c5ad1c30da521bd6464645ada6f7dd8.tar.gz
anaconda-8c9df7368c5ad1c30da521bd6464645ada6f7dd8.tar.xz
anaconda-8c9df7368c5ad1c30da521bd6464645ada6f7dd8.zip
trying to read a label on swap is kind of silly. also, if we fail to read the label, we should just fail gracefully anyway
Diffstat (limited to 'fsset.py')
-rw-r--r--fsset.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/fsset.py b/fsset.py
index fd832ddb3..dd85dd2be 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1113,9 +1113,12 @@ class FileSystemSet:
dev = entry.device.getDevice()
if not dev or dev == "none":
continue
- if not entry.mountpoint:
+ if not entry.mountpoint or entry.mountpoint == "swap":
+ continue
+ try:
+ label = isys.readExt2Label(dev)
+ except:
continue
- label = isys.readExt2Label(dev)
if label:
entry.setLabel(label)
else: