X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=639ff4bcb9999335506828d70ce8df02978c1d7e;hp=ca87e3d1b7fb60bc04d7e3504a7bcb4985e79b38;hb=880305fe1659ab289a917c7627aa014343f46bc9;hpb=940c7c304d4a43c00c27529cdddc7c87db6eef87

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index ca87e3d..639ff4b 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -139,7 +139,6 @@ static char * fix_opts_string (int flags, const char *extra_opts) {
 int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opts, int freq, int passno)
 {
 	struct mntent ment;
-	int fd;
 	FILE *mtab;
 
 	ment.mnt_fsname = fsname;
@@ -149,11 +148,7 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opt
 	ment.mnt_freq = 0;
 	ment.mnt_passno= 0;
 
-	if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)	{
-		fprintf(stderr, "Can't get "MOUNTED"~ lock file");
-		return 1;
-	}
-        close(fd);
+	lock_mtab();
 
         if ((mtab = setmntent(MOUNTED, "a+")) == NULL) {
 		fprintf(stderr, "Can't open " MOUNTED);
@@ -161,21 +156,22 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opt
 	}
 
         if (addmntent(mtab, &ment) == 1) {
+		endmntent(mtab);
+		unlock_mtab();
 		fprintf(stderr, "Can't write mount entry");
 		return 1;
 	}
 
         if (fchmod(fileno(mtab), 0644) == -1) {
+		endmntent(mtab);
+		unlock_mtab();
 		fprintf(stderr, "Can't set perms on " MOUNTED);
 		return 1;
 	}
 
 	endmntent(mtab);
 
-	if (unlink(MOUNTED"~") == -1) {
-		fprintf(stderr, "Can't remove "MOUNTED"~");
-		return 1;
-	}
+	unlock_mtab();
 
 	return 0;
 }
@@ -259,6 +255,26 @@ static void mount_error(char *node)
 	}
 }
 
+static void start_statd()
+{
+	/* If /var/run/rpc.statd.pid exists and is non-empty,
+	 * assume statd already running.
+	 * If START_STATD not defined, or defined to a non-existent file,
+	 * don't bother,
+	 * else run that file (typically a shell script)
+	 */
+	struct stat stb;
+	if (stat("/var/run/rpc.statd.pid", &stb) == 0 &&
+	    stb.st_size > 0)
+		return;
+#ifdef START_STATD
+	if (stat(START_STATD, &stb) ==0 &&
+	    S_ISREG(stb.st_mode) &&
+	    (stb.st_mode & S_IXUSR))
+		system(START_STATD);
+#endif
+}
+
 int main(int argc, char *argv[])
 {
 	int c, flags = 0, nfs_mount_vers = 0, mnt_err = 1, fake = 0;
@@ -279,7 +295,7 @@ int main(int argc, char *argv[])
 			umount_usage();
 			exit(1);
 		}
-		return(nfsumount(argc, argv));
+		exit(nfsumount(argc, argv) ? 0 : 1);
 	}
 
 	if ((argc < 2)) {
@@ -362,11 +378,13 @@ int main(int argc, char *argv[])
 		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, &nfs_mount_vers, 0);
-		}
+	else if (!strcmp(progname, "mount.nfs")) {
+		int need_statd = 0;
+		mnt_err = nfsmount(spec, mount_point, &flags,
+				   &extra_opts, &mount_opts, &nfs_mount_vers,
+				   0, &need_statd);
+		if (!mnt_err && !fake && need_statd)
+			start_statd();
 	}
 
 	if (!mnt_err && !fake) {