SOURCES: nfs-utils-mount-fake.patch - fixed the fake fix from Fedo...

[baggins]

Author: baggins                      Date: Thu Mar 22 13:46:45 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed the fake fix from Fedora :/

---- Files affected:
SOURCES:
   nfs-utils-mount-fake.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/nfs-utils-mount-fake.patch
diff -u SOURCES/nfs-utils-mount-fake.patch:1.1 SOURCES/nfs-utils-mount-fake.patch:1.2
--- SOURCES/nfs-utils-mount-fake.patch:1.1	Tue Mar 20 19:33:20 2007
+++ SOURCES/nfs-utils-mount-fake.patch	Thu Mar 22 14:46:40 2007
@@ -1,31 +1,51 @@
-
-Signed-off-by: Karel Zak <kzak at redhat.com>
-
---- nfs-utils-1.0.10/utils/mount/mount.c.kzak	2007-02-09 12:26:16.000000000 +0100
-+++ nfs-utils-1.0.10/utils/mount/mount.c	2007-02-09 12:27:59.000000000 +0100
-@@ -494,20 +494,21 @@
- 					&extra_opts, &mount_opts,  0);
+--- nfs-utils-1.0.12/utils/mount/mount.c~	2007-03-22 14:43:13.000000000 +0100
++++ nfs-utils-1.0.12/utils/mount/mount.c	2007-03-22 14:45:06.000000000 +0100
+@@ -492,30 +492,31 @@
  		}
  	}
+ 
+-	if (nfs_mount_vers == 4) {
+-		mnt_err = nfs4mount(spec, mount_point, &flags, 
+-			&extra_opts, &mount_opts, 0);
+-	}
+-	else {
+-		if (!strcmp(progname, "mount.nfs")) {
+-			mnt_err = nfsmount(spec, mount_point, &flags,
+-					&extra_opts, &mount_opts,  0);
++	if (!fake) {
++		if (nfs_mount_vers == 4) {
++			mnt_err = nfs4mount(spec, mount_point, &flags, 
++				&extra_opts, &mount_opts, 0);
++		}
++		else {
++			if (!strcmp(progname, "mount.nfs")) {
++				mnt_err = nfsmount(spec, mount_point, &flags,
++						&extra_opts, &mount_opts,  0);
++			}
++		}
++
++		if (mnt_err)
++			exit(EX_FAIL);
++
++		mnt_err = do_mount_syscall(spec, mount_point,
++				nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
++
++		if(mnt_err) {
++			mount_error(mount_point);
++			exit(EX_FAIL);
+ 		}
+-	}
 -	if (fake)
 -		return 0;
- 	if (mnt_err)
- 		exit(EX_FAIL);
- 
+-	if (mnt_err)
+-		exit(EX_FAIL);
+-
 -	mnt_err = do_mount_syscall(spec, mount_point,
 -			nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
-+	if (!fake) {
-+		mnt_err = do_mount_syscall(spec, mount_point,
-+				nfs_mount_vers == 4 ? "nfs4" : "nfs", 
-+				flags, mount_opts);
- 
+-
 -	if(mnt_err) {
 -		mount_error(mount_point);
 -		exit(EX_FAIL);
-+		if (mnt_err) {
-+			mount_error(mount_point);
-+			exit(EX_FAIL);
-+		}
  	}
  
 -	if(!nomtab) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nfs-utils-mount-fake.patch?r1=1.1&r2=1.2&f=u