diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-03-03 17:30:12 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-03-03 17:30:12 +0000 |
| commit | e162f134be648ce26aaa80ad257993432e39f036 (patch) | |
| tree | c2ce01487a9131e88191d05d6c23b148b0308298 | |
| parent | 5cab30e29ab6e48d2db4fba43f182090455238ab (diff) | |
| download | upstream-e162f134be648ce26aaa80ad257993432e39f036.tar.gz upstream-e162f134be648ce26aaa80ad257993432e39f036.tar.bz2 upstream-e162f134be648ce26aaa80ad257993432e39f036.zip | |
AA: hotplug2: restore accidentally deleted patch
Backport of r35863.
Without the 170-non_fatal_include.patch hotplug2 throws this:
Unable to include '/etc/hotplug2-platform.rules'
Syntax error (/etc/hotplug2-common.rules, line 9): Syntax error: Internal parser error.
Unable to include '/etc/hotplug2-common.rules'
Syntax error (/etc/hotplug2-init.rules, line 3): Syntax error: Internal parser error.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35864 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/hotplug2/patches/170-non_fatal_include.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/hotplug2/patches/170-non_fatal_include.patch b/package/hotplug2/patches/170-non_fatal_include.patch new file mode 100644 index 0000000000..0b8e852832 --- /dev/null +++ b/package/hotplug2/patches/170-non_fatal_include.patch @@ -0,0 +1,21 @@ +Index: hotplug2-201/parser/parser.c +=================================================================== +--- hotplug2-201.orig/parser/parser.c 2009-12-09 19:44:13.000000000 +0100 ++++ hotplug2-201/parser/parser.c 2011-02-08 18:06:44.681213713 +0100 +@@ -1,5 +1,7 @@ + #include "parser.h" + ++#include <errno.h> ++ + /* + * Grammar: + * input => directive // TOKEN_ROOTKW +@@ -578,7 +580,7 @@ + ctx.lexer.fp = fopen(filename, "r"); + if (ctx.lexer.fp == NULL) { + parser_clear(&ctx); +- return -1; ++ return (errno == ENOENT) ? 0 : -1; + } + ctx.lexer.filename = strdup(filename); + |