[git commit master] mount: do not execute "mount.(null)" :)

Denys Vlasenko vda.linux at googlemail.com
Tue Sep 15 21:00:09 UTC 2009


commit: http://git.busybox.net/busybox/commit/?id=ba98603264125aceac59c36a36dfbee0f7f67c7f
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 util-linux/mount.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 56c32e1..478dc24 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -448,7 +448,7 @@ static int mount_it_now(struct mntent *mp, long vfsflags, char *filteropts)
 
 		// If mount failed, try
 		// helper program mount.<mnt_type>
-		if (HELPERS_ALLOWED && rc) {
+		if (HELPERS_ALLOWED && rc && mp->mnt_type) {
 			char *args[8];
 			int errno_save = errno;
 			args[0] = xasprintf("mount.%s", mp->mnt_type);
-- 
1.6.3.3



More information about the busybox-cvs mailing list