Attachment 244857 Details for Bug 433893

[patch] A proposed patch

SpaceCalculation.ycp.diff (text/plain), 1.16 KB, created by Ladislav Slezák on 2008-10-10 12:28:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ladislav Slezák

Created: 2008-10-10 12:28:51 UTC

Size: 1.16 KB

patch

obsolete

>Index: SpaceCalculation.ycp
>===================================================================
>--- SpaceCalculation.ycp	(revision 51996)
>+++ SpaceCalculation.ycp	(working copy)
>@@ -321,9 +321,27 @@
> 				tmpdir = tmpdir + "/diskspace_mount";
> 				SCR::Execute (.target.bash, sformat (
> 				    "test -d %1 || mkdir -p %1", tmpdir));
>-				SCR::Execute (.target.bash, sformat (
>-				    "/bin/mount -o ro %1 %2",
>-				    part["device"]:"", tmpdir));
>+
>+				// mount in read-only mode (safer)
>+				list<string> mount_options = ["ro"];
>+
>+				// add "nolock" if it's a NFS share (bnc#433893)
>+				if (used_fs == `nfs)
>+				{
>+				    y2milestone("Mounting NFS with 'nolock' option");
>+				    mount_options = add(mount_options, "nolock");
>+				}
>+
>+				// join the options
>+				string mount_options_str = mergestring(mount_options, ",");
>+
>+				string mount_command = sformat("/bin/mount -o %1 %2 %3",
>+				    mount_options_str, part["device"]:"", tmpdir);
>+
>+				y2milestone("Executing mount command: %1", mount_command);
>+
>+				SCR::Execute(.target.bash, mount_command);
>+
> 				list<map<string,string> > partition =
> 				    (list<map<string, string> >)
> 				    SCR::Read(.run.df);

Actions: View | Diff

Attachments on bug 433893: 244616 | 244617 | 244618 | 244857