Author: locilka Date: Tue Mar 29 09:30:55 2011 New Revision: 63677

URL: http://svn.opensuse.org/viewcvs/yast?rev=63677&view=rev Log: Mounting NFS shares with 'nolock' (bnc #682064)

Modified: trunk/restore/package/yast2-restore.changes trunk/restore/src/Restore.ycp

Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.cha... ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Tue Mar 29 09:30:55 2011 @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 29 09:28:49 CEST 2011 - locilka@suse.cz + +- Mounting NFS shares with 'nolock' (bnc #682064) + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz

Modified: trunk/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Restore.ycp?rev=63677... ============================================================================== --- trunk/restore/src/Restore.ycp (original) +++ trunk/restore/src/Restore.ycp Tue Mar 29 09:30:55 2011 @@ -410,7 +410,8 @@ y2milestone("file: %1", f); y2milestone("mpoint: %1", mpoint);

- boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro"); + // BNC #682064: also 'nolock' is required + boolean result = (boolean) SCR::Execute(.target.mount, [server + ":" + dir, mpoint], "-t nfs -o ro,nolock");

return $[ "mounted" : result, "mountpoint" : mpoint , "file" : f, "server_dir" : dir ]; }