nfs-utils-mount-fake.patch

   1 --- nfs-utils-1.1.0-rc1/utils/mount/mount.c~    2007-03-29 05:55:33.000000000 +0200
   2 +++ nfs-utils-1.1.0-rc1/utils/mount/mount.c     2007-04-05 18:58:38.000000000 +0200
   3 @@ -508,30 +508,30 @@
   4             }
   5         }
   6
   7 -       if (nfs_mount_vers == 4)
   8 -               mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
   9 -       else {
  10 -               int need_statd = 0;
  11 -               mnt_err = nfsmount(spec, mount_point, &flags,
  12 -                                  &extra_opts, &mount_opts,
  13 -                                  0, &need_statd);
  14 -               if (!mnt_err && !fake && need_statd) {
  15 -                       if (!start_statd()) {
  16 -                               fprintf(stderr,
  17 -                                       "%s: rpc.statd is not running but is "
  18 -                                       "required for remote locking\n"
  19 -                                       "   Either use \"-o nolocks\" to keep "
  20 -                                       "locks local, or start statd.\n",
  21 -                                       progname);
  22 -                               exit(1);
  23 +       if (!fake) {
  24 +               if (nfs_mount_vers == 4)
  25 +                       mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
  26 +               else {
  27 +                       int need_statd = 0;
  28 +                       mnt_err = nfsmount(spec, mount_point, &flags,
  29 +                                          &extra_opts, &mount_opts,
  30 +                                          0, &need_statd);
  31 +                       if (!mnt_err && need_statd) {
  32 +                               if (!start_statd()) {
  33 +                                       fprintf(stderr,
  34 +                                               "%s: rpc.statd is not running but is "
  35 +                                               "required for remote locking\n"
  36 +                                               "   Either use \"-o nolocks\" to keep "
  37 +                                               "locks local, or start statd.\n",
  38 +                                               progname);
  39 +                                       exit(1);
  40 +                               }
  41                         }
  42                 }
  43 -       }
  44
  45 -       if (mnt_err)
  46 -               exit(EX_FAIL);
  47 +               if (mnt_err)
  48 +                       exit(EX_FAIL);
  49
  50 -       if (!fake) {
  51                 mnt_err = do_mount_syscall(spec, mount_point,
  52                                            nfs_mount_vers == 4 ? "nfs4" : "nfs",
  53                                            flags & ~(MS_USER|MS_USERS) ,