mdev: be more permissive on errors (dont die): mdev -s users want that

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index f9ecf3cd6b5282b412d46afa414a9bc410e3d386..2ac15e762f23282b4e26aa483f38aff97a450611 100644 (file)
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -303,8 +303,12 @@ static void make_device(char *path, int delete)
                                const char *s = "$@*";
                                const char *s2 = strchr(s, val[0]);
 
-                               if (!s2)
-                                       bb_error_msg_and_die("bad line %u", parser->lineno);
+                               if (!s2) {
+                                       bb_error_msg("bad line %u", parser->lineno);
+                                       if (ENABLE_FEATURE_MDEV_RENAME)
+                                               free(alias);
+                                       continue;
+                               }
 
                                /* Are we running this command now?
                                 * Run $cmd on delete, @cmd on create, *cmd on both
@@ -346,7 +350,7 @@ static void make_device(char *path, int delete)
                                putenv(s);
                                putenv(s1);
                                if (system(command) == -1)
-                                       bb_perror_msg_and_die("can't run '%s'", command);
+                                       bb_perror_msg("can't run '%s'", command);
                                unsetenv("SUBSYSTEM");
                                free(s1);
                                unsetenv("MDEV");