From 382ec19477c609228fa2d22dd43245ac9a62101c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 22 Aug 2008 23:30:44 +0000 Subject: [PATCH] Update patch to match upstream --- lirc-dont-exit.patch | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lirc-dont-exit.patch b/lirc-dont-exit.patch index 2e71411..9485dba 100644 --- a/lirc-dont-exit.patch +++ b/lirc-dont-exit.patch @@ -1,20 +1,20 @@ -Index: daemons/lircd.c -=================================================================== -RCS file: /cvsroot/lirc/lirc/daemons/lircd.c,v -retrieving revision 5.77 -diff -u -p -u -p -r5.77 lircd.c ---- daemons/lircd.c 9 May 2008 18:40:59 -0000 5.77 -+++ daemons/lircd.c 14 Aug 2008 08:56:50 -0000 -@@ -518,7 +518,11 @@ void add_client(int sock) - shutdown(clis[0],2); - close(clis[0]); - clin=0; +--- daemons/lircd.c 2008/05/09 18:40:59 5.77 ++++ daemons/lircd.c 2008/08/21 18:39:25 5.78 +@@ -515,10 +515,13 @@ + { + if(!hw.init_func()) + { +- shutdown(clis[0],2); +- close(clis[0]); +- clin=0; - dosigterm(SIGTERM); -+ /* Don't exit here, otherwise lirc bails out, -+ * and lircd exits, making it impossible to -+ * connect to when we have a device actually -+ * plugged in. -+ dosigterm(SIGTERM); */ ++ logprintf(LOG_WARNING, ++ "Failed to initialize hardware"); ++ /* Don't exit here, otherwise lirc ++ * bails out, and lircd exits, making ++ * it impossible to connect to when we ++ * have a device actually plugged ++ * in. */ } } }