summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-03-04 10:21:40 -0500
committerChris Lumens <clumens@redhat.com>2009-03-04 15:33:27 -0500
commit80e71234c8952f938964f3f9680e4b06f5d5201b (patch)
tree68782311a1748ee45bacb33cf11088a7bf43fd7c
parentdc45f089c48665590890325e7aaebd67b2285c4a (diff)
downloadanaconda-80e71234c8952f938964f3f9680e4b06f5d5201b.tar.gz
anaconda-80e71234c8952f938964f3f9680e4b06f5d5201b.tar.xz
anaconda-80e71234c8952f938964f3f9680e4b06f5d5201b.zip
Handle mountopts being empty.
We want to do the check for empty twice, since removing "defaults" and "defaults," may make the original mountopts empty.
-rw-r--r--storage/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/__init__.py b/storage/__init__.py
index cba5d0990..11e2e7b51 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -1111,8 +1111,10 @@ class FSSet(object):
continue
if device.format.mountpoint:
options = device.format.mountopts
- options = options.replace("defaults,", "")
- options = options.replace("defaults", "")
+ if options:
+ options = options.replace("defaults,", "")
+ options = options.replace("defaults", "")
+
if options:
options = "rw," + options
else: