[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

Chris Cheney ccheney at kemper.freedesktop.org
Wed May 19 10:18:47 PDT 2010


 patches/dev300/ubuntu-soffice-config.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d05ca937102dca2c0b54c42416ccc7bc391f3052
Author: Chris Cheney <ccheney at ubuntu.com>
Date:   Wed May 19 12:16:39 2010 -0500

    Add support to turn off locking for cifs.
    
    However, coreutils 7.4 still does not recognize cifs yet.
    
    * patches/dev300/soffice-opengl-and-locking-config.diff: Add support to turn
      off locking for cifs.

diff --git a/patches/dev300/ubuntu-soffice-config.diff b/patches/dev300/ubuntu-soffice-config.diff
index be3660c..57c6506 100644
--- a/patches/dev300/ubuntu-soffice-config.diff
+++ b/patches/dev300/ubuntu-soffice-config.diff
@@ -20,7 +20,7 @@ Index: soffice.sh
 +# Ubuntu helper functions
 +home_on_nfs()
 +{
-+    case $(stat -f -c %T $HOME) in nfs|smb)
++    case $(stat -f -c %T $HOME) in cifs|nfs|smb)
 +        return 0
 +    esac
 +    return 1
@@ -29,7 +29,7 @@ Index: soffice.sh
 +    for i; do
 +       case "$i" in -*) continue; esac
 +       [ -f "$i" ] || continue
-+       case $(stat -f -c %T "$i") in nfs|smb)
++       case $(stat -f -c %T "$i") in cifs|nfs|smb)
 +            return 0
 +       esac
 +    done
@@ -151,7 +151,7 @@ Index: soffice.sh
 +# Ubuntu helper functions
 +home_on_nfs()
 +{
-+    case $(stat -f -c %T $HOME) in nfs*|smb)
++    case $(stat -f -c %T $HOME) in cifs|nfs*|smb)
 +        return 0
 +    esac
 +    return 1
@@ -160,7 +160,7 @@ Index: soffice.sh
 +    for i; do
 +       case "$i" in -*) continue; esac
 +       [ -f "$i" ] || continue
-+       case $(stat -f -c %T "$i") in nfs*|smb)
++       case $(stat -f -c %T "$i") in cifs|nfs*|smb)
 +            return 0
 +       esac
 +    done


More information about the ooo-build-commit mailing list