int
nfsmount(const char *spec, const char *node, int flags,
- char **extra_opts, int fake)
+ char **extra_opts, int fake, int running_bg)
{
static char *prev_bg_host;
char hostdir[1024];
char *hostname, *dirname, *old_opts, *mounthost = NULL;
char new_opts[1024], cbuf[1024];
static struct nfs_mount_data data;
- int val, running_bg = 0;
+ int val;
static int doonce = 0;
clnt_addr_t mnt_server = { &mounthost, };
if (errno == ETIMEDOUT)
break;
default:
- mount_errors(*nfs_server.hostname, 0, bg);
+ rpc_mount_errors(*nfs_server.hostname, 0, bg);
goto fail;
}
t = time(NULL);
if (t >= timeout) {
- mount_errors(*nfs_server.hostname, 0, bg);
+ rpc_mount_errors(*nfs_server.hostname, 0, bg);
goto fail;
}
- mount_errors(*nfs_server.hostname, 1, bg);
+ rpc_mount_errors(*nfs_server.hostname, 1, bg);
continue;
}
if (!running_bg) {
}
t = time(NULL);
if (t >= timeout) {
- mount_errors(*nfs_server.hostname, 0, bg);
+ rpc_mount_errors(*nfs_server.hostname, 0, bg);
goto fail;
}
if (doonce++ < 1)
- mount_errors(*nfs_server.hostname, 1, bg);
+ rpc_mount_errors(*nfs_server.hostname, 1, bg);
}
if (nfs_pmap->pm_vers == 2) {
if (!start_statd()) {
nfs_error(_("%s: rpc.statd is not running but is "
"required for remote locking.\n"
- " Either use '-o nolocks' to keep "
+ " Either use '-o nolock' to keep "
"locks local, or start statd."),
progname);
goto fail;
}
}
- return 0;
+ return EX_SUCCESS;
/* abort */
fail: