1 --- nfs-utils-1.0.12/utils/mount/mount.c~ 2007-03-22 14:43:13.000000000 +0100
2 +++ nfs-utils-1.0.12/utils/mount/mount.c 2007-03-22 14:45:06.000000000 +0100
7 - if (nfs_mount_vers == 4) {
8 - mnt_err = nfs4mount(spec, mount_point, &flags,
9 - &extra_opts, &mount_opts, 0);
12 - if (!strcmp(progname, "mount.nfs")) {
13 - mnt_err = nfsmount(spec, mount_point, &flags,
14 - &extra_opts, &mount_opts, 0);
16 + if (nfs_mount_vers == 4) {
17 + mnt_err = nfs4mount(spec, mount_point, &flags,
18 + &extra_opts, &mount_opts, 0);
21 + if (!strcmp(progname, "mount.nfs")) {
22 + mnt_err = nfsmount(spec, mount_point, &flags,
23 + &extra_opts, &mount_opts, 0);
30 + mnt_err = do_mount_syscall(spec, mount_point,
31 + nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
34 + mount_error(mount_point);
43 - mnt_err = do_mount_syscall(spec, mount_point,
44 - nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
47 - mount_error(mount_point);
53 add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
54 flags, extra_opts, 0, 0);