X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_utils_run.c;h=8137ec1c66168530f615069ecd97c4560ad2ffb6;hp=76a704c52cb19b93db15fe517f2b3171043708b8;hb=596714857b0c6b2779e861e4069d63f0fa27aa28;hpb=36af2ddcb92c51acad0f909bb5dfb090cea9c5ed

diff --git a/udev_utils_run.c b/udev_utils_run.c
index 76a704c52..8137ec1c6 100644
--- a/udev_utils_run.c
+++ b/udev_utils_run.c
@@ -1,6 +1,4 @@
 /*
- * udev_utils_run.c - execute programs from udev and read its output
- *
  * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
@@ -14,7 +12,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -151,14 +149,22 @@ int run_program(const char *command, const char *subsystem,
 			close(devnull);
 		} else
 			err("open /dev/null failed: %s", strerror(errno));
-		if (outpipe[WRITE_END] > 0)
+		if (outpipe[WRITE_END] > 0) {
 			dup2(outpipe[WRITE_END], STDOUT_FILENO);
-		if (errpipe[WRITE_END] > 0)
+			close(outpipe[WRITE_END]);
+		}
+		if (errpipe[WRITE_END] > 0) {
 			dup2(errpipe[WRITE_END], STDERR_FILENO);
+			close(errpipe[WRITE_END]);
+		}
 		execv(argv[0], argv);
-
-		/* we should never reach this */
-		err("exec of program '%s' failed", argv[0]);
+		if ((errno == ENOENT) || (errno = ENOTDIR)) {
+			/* may be on a filesytem which is not mounted right now */
+			info("program '%s' not found", argv[0]);
+		} else {
+			/* other problems */
+			err("exec of program '%s' failed", argv[0]);
+		}
 		_exit(1);
 	case -1:
 		err("fork of '%s' failed: %s", argv[0], strerror(errno));