emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-07-02 13:17:10 +02:00
parent 90db359972
commit 5478aaf5b8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util-linux/mdev.c
View File

@ -303,8 +303,12 @@ static void make_device(char *path, int delete)
const char *s = "$@*"; const char *s = "$@*";
const char *s2 = strchr(s, val[0]); const char *s2 = strchr(s, val[0]);
if (!s2) if (!s2) {
bb_error_msg_and_die("bad line %u", parser->lineno); bb_error_msg("bad line %u", parser->lineno);
if (ENABLE_FEATURE_MDEV_RENAME)
free(alias);
continue;
}
/* Are we running this command now? /* Are we running this command now?
* Run $cmd on delete, @cmd on create, *cmd on both * 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(s);
putenv(s1); putenv(s1);
if (system(command) == -1) if (system(command) == -1)
bb_perror_msg_and_die("can't run '%s'", command); bb_perror_msg("can't run '%s'", command);
unsetenv("SUBSYSTEM"); unsetenv("SUBSYSTEM");
free(s1); free(s1);
unsetenv("MDEV"); unsetenv("MDEV");