Merge branch 'sid'

[nfs-utils.git] / debian / patches / 03-handle-mtab-symlink.patch

diff --git a/debian/patches/03-handle-mtab-symlink.patch b/debian/patches/03-handle-mtab-symlink.patch
index 28211a56138cd2beb71c9d32b90dee072c4fed97..06dd781041736ab06b8df20c6cd9431e2de70b94 100644 (file)
--- a/debian/patches/03-handle-mtab-symlink.patch
+++ b/debian/patches/03-handle-mtab-symlink.patch
@@ -1,8 +1,6 @@
-Index: nfs-utils-1.1.2/utils/mount/fstab.c
-===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/fstab.c
-+++ nfs-utils-1.1.2/utils/mount/fstab.c
-@@ -52,7 +52,7 @@ mtab_does_not_exist(void) {
+--- a/utils/mount/fstab.c      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/mount/fstab.c      2010-04-06 16:12:51.000000000 +1000
+@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
        return var_mtab_does_not_exist;
  }
  
@@ -11,10 +9,8 @@ Index: nfs-utils-1.1.2/utils/mount/fstab.c
  mtab_is_a_symlink(void) {
          get_mtab_info();
          return var_mtab_is_a_symlink;
-Index: nfs-utils-1.1.2/utils/mount/fstab.h
-===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/fstab.h
-+++ nfs-utils-1.1.2/utils/mount/fstab.h
+--- a/utils/mount/fstab.h      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/mount/fstab.h      2010-04-06 16:12:51.000000000 +1000
 @@ -7,6 +7,7 @@
  #define _PATH_FSTAB "/etc/fstab"
  #endif
@@ -22,14 +18,12 @@ Index: nfs-utils-1.1.2/utils/mount/fstab.h
 +int mtab_is_a_symlink(void);
  int mtab_is_writable(void);
  int mtab_does_not_exist(void);
- 
-Index: nfs-utils-1.1.2/utils/mount/mount.c
-===================================================================
---- nfs-utils-1.1.2.orig/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -257,6 +257,13 @@ static int add_mtab(char *spec, char *mo
-               return EX_SUCCESS;
-       }
+ void reset_mtab_info(void);
+--- a/utils/mount/mount.c      2010-02-18 23:35:00.000000000 +1100
++++ b/utils/mount/mount.c      2010-04-06 16:12:51.000000000 +1000
+@@ -232,6 +232,13 @@ create_mtab (void) {
+       int flags;
+       mntFILE *mfp;
  
 +      /* Avoid writing if the mtab is a symlink to /proc/mounts, since
 +         that would create a file /proc/mounts in case the proc filesystem
@@ -40,4 +34,4 @@ Index: nfs-utils-1.1.2/utils/mount/mount.c
 +
        lock_mtab();
  
-       mtab = nfs_setmntent(MOUNTED, "a+");
+       mfp = nfs_setmntent (MOUNTED, "a+");