--- embedtools/src/cfexec.c	2017/10/08 22:34:41	1.5.20.5
+++ embedtools/src/cfexec.c	2018/01/01 23:48:32	1.5.20.6
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: cfexec.c,v 1.5.20.5 2017/10/08 22:34:41 misho Exp $
+ * $Id: cfexec.c,v 1.5.20.6 2018/01/01 23:48:32 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2017
+Copyright 2004 - 2018
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -71,17 +71,34 @@ Usage()
 		"\n", compiled, compiledby, compilehost);
 }
 
+struct statfs *
+getmntpt(const char *name)
+{
+	struct statfs *mntbuf;
+	int i, mntsize;
+
+	mntsize = getmntinfo(&mntbuf, MNT_NOWAIT);
+	for (i = mntsize - 1; i >= 0; i--) {
+		if (!strcmp(mntbuf[i].f_mntfromname, name) ||
+		    !strcmp(mntbuf[i].f_mntonname, name))
+			return &mntbuf[i];
+	}
+
+	return NULL;
+}
+
 static int
 update(int flags)
 {
 	struct ufs_args mnt;
+	struct statfs *mntfs = getmntpt(AIT_GET_STR(&Mount));
 
 	memset(&mnt, 0, sizeof mnt);
-	mnt.fspec = AIT_GET_STR(&Dev);
+	mnt.fspec = mntfs->f_mntfromname;
 #ifdef __NetBSD__
-	if (mount("ufs", AIT_GET_STR(&Mount), flags, &mnt, sizeof mnt) == -1) {
+	if (mount(mntfs->f_fstypename, mntfs->f_mntonname, flags, &mnt, sizeof mnt) == -1) {
 #else
-	if (mount("ufs", AIT_GET_STR(&Mount), flags, &mnt) == -1) {
+	if (mount(mntfs->f_fstypename, mntfs->f_mntonname, flags, &mnt) == -1) {
 #endif
 		printf("Error:: can`t update mount %s #%d - %s\n", AIT_GET_STR(&Mount), 
 				errno, strerror(errno));
@@ -325,8 +342,10 @@ main(int argc, char **argv)
 				if ((f = mkevent(&chg, &evt)) == -1)
 					return 4;
 
-				if (update(MNT_UPDATE) == -1)
-					return 5;
+				if (update(MNT_UPDATE) == -1) {
+					stat = 5;
+					goto skip;
+				}
 
 				if (Timeout) {
 					memset(&ts, 0, sizeof ts);
@@ -349,7 +368,7 @@ main(int argc, char **argv)
 						if (access(szSLCK, F_OK) && update(MNT_UPDATE | MNT_RDONLY) == -1)
 							stat = 8;
 				}
-
+skip:
 				close(kq);
 				close(f);
 				unlink(szSess);
@@ -368,8 +387,10 @@ main(int argc, char **argv)
 		else
 			close(f);
 
-		if (update(MNT_UPDATE) == -1)
+		if (update(MNT_UPDATE) == -1) {
+			unlink(szSess);
 			return 5;
+		}
 
 		switch ((pid = vfork())) {
 			case -1: