From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 3 Mar 2013 17:05:05 +0000 (+0000)
Subject: hotplug2: restore accidentally deleted patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f0cc47d8575d68bab55ad3d192f0815dced6a4a;p=openwrt%2Fstaging%2Fblocktrron.git

hotplug2: restore accidentally deleted patch

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: 35863
---

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);
+