AA: hotplug2: restore accidentally deleted patch
authorGabor Juhos <juhosg@openwrt.org>
Sun, 3 Mar 2013 17:30:12 +0000 (17:30 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sun, 3 Mar 2013 17:30:12 +0000 (17:30 +0000)
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>
SVN-Revision: 35864

package/hotplug2/patches/170-non_fatal_include.patch [new file with mode: 0644]

diff --git a/package/hotplug2/patches/170-non_fatal_include.patch b/package/hotplug2/patches/170-non_fatal_include.patch
new file mode 100644 (file)
index 0000000..0b8e852
--- /dev/null
@@ -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);