summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorRadek Vykydal <rvykydal@redhat.com>2009-12-03 15:12:30 +0100
committerRadek Vykydal <rvykydal@redhat.com>2009-12-03 15:19:43 +0100
commit22e0f8532c707c05bdfd841f53e06181832ff5fe (patch)
treee80ab11df11c7c1591f2bffdf1efb82dc56a5f3f /isys
parent3df62f5157c8dd930b0c98bfecc64f558867965b (diff)
downloadanaconda-22e0f8532c707c05bdfd841f53e06181832ff5fe.tar.gz
anaconda-22e0f8532c707c05bdfd841f53e06181832ff5fe.tar.xz
anaconda-22e0f8532c707c05bdfd841f53e06181832ff5fe.zip
Enable method/repo nfs options in stage2.
In stage 2, the nfs options given in repo= boot parameter were malparsed, in UI they were ignored. Note that now the options can get to stage 2 only via method=/repo= boot parameter. Ks nfs option --opts works only when its url specifies stage2 (i.e. ends with images/install.img). In cases when method (--repo parameter for anaconda python script) is inferred from stage2, nfs options of stage2 "nfs:..." url aren't passed to stage 2.
Diffstat (limited to 'isys')
-rwxr-xr-xisys/isys.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/isys/isys.py b/isys/isys.py
index 338ca2651..44c380baf 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -120,10 +120,13 @@ def unlosetup(device):
# @param remount Are we mounting an already mounted filesystem?
# @return The return value from the mount system call.
def mount(device, location, fstype = "ext2", readOnly = False,
- bindMount = False, remount = False, options = "defaults"):
+ bindMount = False, remount = False, options = None):
flags = None
location = os.path.normpath(location)
- opts = string.split(options)
+ if not options:
+ opts = "defaults"
+ else:
+ opts = options.split(",")
# We don't need to create device nodes for devices that start with '/'
# (like '/usbdevfs') and also some special fake devices like 'proc'.