diff options
| author | Denys Vlasenko | 2009-07-02 13:17:10 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2009-07-02 13:17:10 +0200 |
| commit | 5478aaf5b8f9a90ab37d9de89fc893886f9580db (patch) | |
| tree | b4f064d3eb528c0e0216ec9708a29804f7a352c5 /util-linux | |
| parent | 90db359972643801300d4139025a25e0ba47c278 (diff) | |
| download | busybox-5478aaf5b8f9a90ab37d9de89fc893886f9580db.zip busybox-5478aaf5b8f9a90ab37d9de89fc893886f9580db.tar.gz | |
mdev: be more permissive on errors (dont die): mdev -s users want that
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mdev.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index f9ecf3c..2ac15e7 100644 --- 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"); |