Author: locilka Date: Tue Mar 29 09:31:08 2011 New Revision: 63678 URL: http://svn.opensuse.org/viewcvs/yast?rev=63678&view=rev Log: Mounting NFS shares with 'nolock' (bnc #682064) Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp Modified: branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes?rev=63678&r1=63677&r2=63678&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/package/yast2-restore.changes Tue Mar 29 09:31:08 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Mar 29 09:28:49 CEST 2011 - locilka@suse.cz + +- Mounting NFS shares with 'nolock' (bnc #682064) + +------------------------------------------------------------------- Mon Dec 14 11:12:13 CET 2009 - locilka@suse.cz - Fixed restoration of unavailable packages (bnc #553400). Modified: branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp?rev=63678&r1=63677&r2=63678&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/restore/src/Restore.ycp Tue Mar 29 09:31:08 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 ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org