Index: install.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/install.c,v retrieving revision 1.268.2.42 diff -u -r1.268.2.42 install.c --- install.c 22 Feb 2003 21:16:47 -0000 1.268.2.42 +++ install.c 18 Oct 2003 21:01:36 -0000 @@ -1139,6 +1139,8 @@ variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/links", 0); variable_set2(VAR_FTP_STATE, "passive", 0); variable_set2(VAR_NFS_SECURE, "NO", -1); + variable_set2(VAR_NFS_TCP, "NO", -1); + variable_set2(VAR_NFS_V3, "YES", -1); if (OnVTY) variable_set2(VAR_FIXIT_TTY, "standard", 0); else Index: nfs.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/nfs.c,v retrieving revision 1.21.2.2 diff -u -r1.21.2.2 nfs.c --- nfs.c 13 Jul 2003 07:04:42 -0000 1.21.2.2 +++ nfs.c 18 Oct 2003 21:01:36 -0000 @@ -60,9 +60,13 @@ return FALSE; msgNotify("Mounting %s over NFS on %s", dev->name, mountpoint); - if (vsystem("mount_nfs %s %s %s %s", - variable_get(VAR_SLOW_ETHER) ? "-r 1024 -w 1024" : "", - variable_get(VAR_NFS_SECURE) ? "-P" : "", dev->name, mountpoint)) { + if (vsystem("mount_nfs %s %s %s %s %s %s", + !variable_cmp(VAR_NFS_TCP, "YES") ? "-T" : "", + !variable_cmp(VAR_NFS_V3, "YES") ? "-3" : "", + !variable_cmp(VAR_SLOW_ETHER, "YES") ? + "-r 1024 -w 1024" : "-r 4096 -w 4096", + !variable_cmp(VAR_NFS_SECURE, "YES") ? "-P" : "", + dev->name, mountpoint)) { msgConfirm("Error mounting %s on %s: %s.", dev->name, mountpoint, strerror(errno)); if (netDevice) DEVICE_SHUTDOWN(netDevice); Index: options.c =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/options.c,v retrieving revision 1.70.2.6 diff -u -r1.70.2.6 options.c --- options.c 15 Jul 2003 08:17:15 -0000 1.70.2.6 +++ options.c 18 Oct 2003 21:01:36 -0000 @@ -112,6 +112,10 @@ OPT_IS_VAR, NULL, VAR_NFS_SECURE, varCheck }, { "NFS Slow", "User is using a slow PC or ethernet card", OPT_IS_VAR, NULL, VAR_SLOW_ETHER, varCheck }, +{ "NFS TCP", "Use TCP protocol for NFS", + OPT_IS_VAR, NULL, VAR_NFS_TCP, varCheck }, +{ "NFS version 3", "Use NFS version 3", + OPT_IS_VAR, NULL, VAR_NFS_V3, varCheck }, { "Debugging", "Emit extra debugging output on VTY2 (ALT-F2)", OPT_IS_VAR, NULL, VAR_DEBUG, varCheck }, { "No Warnings", "Don't Warn the user when a setting seems incorrect", Index: sysinstall.h =================================================================== RCS file: /home/ncvs/src/release/sysinstall/Attic/sysinstall.h,v retrieving revision 1.186.2.31 diff -u -r1.186.2.31 sysinstall.h --- sysinstall.h 18 Sep 2003 19:17:48 -0000 1.186.2.31 +++ sysinstall.h 18 Oct 2003 21:01:36 -0000 @@ -147,6 +147,8 @@ #define VAR_NEWFS_ARGS "newfsArgs" #define VAR_NFS_PATH "nfs" #define VAR_NFS_HOST "nfsHost" +#define VAR_NFS_V3 "nfs_use_v3" +#define VAR_NFS_TCP "nfs_use_tcp" #define VAR_NFS_SECURE "nfs_reserved_port_only" #define VAR_NFS_SERVER "nfs_server_enable" #define VAR_NO_CONFIRM "noConfirm"