← Back to branch summary

~ubuntu-branches/ubuntu/raring/am-utils/raring

« back to all changes in this revision

Viewing changes to debian/patches/nfs-mount-version.patch

  • Committer: Bazaar Package Importer
  • Author(s): Nathan Handler
  • Date: 2008-09-23 19:51:56 UTC
  • mfrom: (4.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080923195156-udxn0nfuaqxfe10l
Tags: 6.1.5-12ubuntu1
https://launchpad.net/bugs/269998
* Merge from debian unstable, remaining changes (LP: #269998):
  - Copied debian/am-utils.copyright to debian/copyright (now made via cat
    debian/am-utils.copyright.in COPYING > debian/copyright) to pass Ubuntus
    upload checks for missing debian/copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/nfs-mount-version.patch
 
1
--- am-utils.orig/conf/mount/mount_linux.c
 
2
+++ am-utils/conf/mount/mount_linux.c
 
3
@@ -277,7 +277,11 @@
 
4
   int errorcode;
 
5
 
 
6
   /* Fake some values for linux */
 
7
+#if NFS_MOUNT_VERSION > 4
 
8
+  mnt_data->version = 4;
 
9
+#else
 
10
   mnt_data->version = NFS_MOUNT_VERSION;
 
11
+#endif /* NFS_MOUNT_VERSION > 4 */
 
12
   if (!mnt_data->timeo) {
 
13
 #ifdef MNT2_NFS_OPT_TCP
 
14
     if (mnt_data->flags & MNT2_NFS_OPT_TCP)