[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

[Mike Christie]

The following commit has been merged in the upstream-mnc branch:
commit f69f9d781a537d4cce1e7c90779feabb052f87e5
Author: Jim Ramsay <jim_ramsay at dell.com>
Date:   Wed Jul 20 09:06:44 2011 -0400

    iscsid: In foreground mode, treat SIGINT like SIGTERM
    
    This allows ^C to exit iscsid but only when it is running in foreground
    mode, which is useful for testing.
    
    Signed-off-by: Jim Ramsay <jim_ramsay at dell.com>

diff --git a/usr/iscsid.c b/usr/iscsid.c
index 1a37347..9df6658 100644
--- a/usr/iscsid.c
+++ b/usr/iscsid.c
@@ -304,6 +304,11 @@ static void iscsid_shutdown(void)
 static void catch_signal(int signo)
 {
 	log_debug(1, "pid %d caught signal %d", getpid(), signo);
+
+	/* In foreground mode, treat SIGINT like SIGTERM */
+	if (!daemonize && signo == SIGINT)
+		signo = SIGTERM;
+
 	switch (signo) {
 	case SIGTERM:
 		iscsid_shutdown();

-- 
Debian Open-iSCSI Packaging