Skip to content

Commit

Permalink
Use options from partitioner during test mount (bcn#915758)
Browse files Browse the repository at this point in the history
 - This is a backport of the fix at version 3.1.43
  • Loading branch information
ancorgs committed Feb 3, 2015
1 parent 8458fd7 commit 1e41e14
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/modules/SpaceCalculation.ycp
Expand Up @@ -620,8 +620,17 @@
SCR::Execute (.target.bash, sformat (
"test -d %1 || mkdir -p %1", tmpdir));

// mount options determined by partitioner
list<string> mount_options = splitstring(part["fstopt"]:"", ",");
// filter out empty options, just in case
mount_options = filter(
string opt,
mount_options,
{return regexpmatch (opt, "[^ ]");}
);

// mount in read-only mode (safer)
list<string> mount_options = ["ro"];
mount_options = add(mount_options, "ro");

// add "nolock" if it's a NFS share (bnc#433893)
if (used_fs == `nfs)
Expand Down

0 comments on commit 1e41e14

Please sign in to comment.