d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pidfile(3) API to restart mountd(8) on success mount.

Browse Source 
This why we won't kill random process if there is a stale PID in
/var/run/mountd.pid.
This commit is contained in:
Pawel Jakub Dawidek 2007-02-02 23:58:10 +00:00
parent 217f71d80c
commit e9988ceda3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=166439
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/mount/Makefile
View File

@ -7,4 +7,7 @@ WARNS?= 6
MAN= mount.8
# We do NOT install the getmntopts.3 man page.
DPADD= ${LIBUTIL}
LDADD= -lutil
.include <bsd.prog.mk>

35
sbin/mount/mount.c
View File

@ -58,6 +58,7 @@ static const char rcsid[] =
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <libutil.h>
#include "extern.h"
#include "mntopts.h"
@ -204,14 +205,33 @@ specified_ro(const char *arg)
return (ret);
}
static void
restart_mountd(void)
{
struct pidfh *pfh;
pid_t mountdpid;
pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &mountdpid);
if (pfh != NULL) {
/* Mountd is not running. */
pidfile_remove(pfh);
return;
}
if (errno != EEXIST) {
/* Cannot open pidfile for some reason. */
return;
}
/* We have mountd(8) PID in mountdpid varible, let's signal it. */
if (kill(mountdpid, SIGHUP) == -1)
err(1, "signal mountd");
}
int
main(int argc, char *argv[])
{
const char *mntfromname, **vfslist, *vfstype;
struct fstab *fs;
struct statfs *mntbuf;
FILE *mountdfp;
pid_t pid;
int all, ch, i, init_flags, late, mntsize, rval, have_fstab, ro;
char *cp, *ep, *options;
@ -411,15 +431,10 @@ main(int argc, char *argv[])
/*
* If the mount was successfully, and done by root, tell mountd the
* good news. Pid checks are probably unnecessary, but don't hurt.
* good news.
*/
if (rval == 0 && getuid() == 0 &&
(mountdfp = fopen(_PATH_MOUNTDPID, "r")) != NULL) {
if (fscanf(mountdfp, "%d", &pid) == 1 &&
pid > 0 && kill(pid, SIGHUP) == -1 && errno != ESRCH)
err(1, "signal mountd");
(void)fclose(mountdfp);
}
if (rval == 0 && getuid() == 0)
restart_mountd();
exit(rval);
}