From 2763f1978e1aaa557d7bc3fd02ccd59c52cd91c6 Mon Sep 17 00:00:00 2001 From: Ashlesh Gawande Date: Wed, 25 Oct 2017 15:48:39 -0500 Subject: [PATCH] Use SIGQUIT instead of SIGINT refs: #3870 Change-Id: I915d9422d56a441b351bb9ab38a0c8377e1da34f --- bin/minindn | 2 +- docs/GETTING-STARTED.md | 4 ++++ ndn/nfd.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/minindn b/bin/minindn index ddcc95d..bf255df 100755 --- a/bin/minindn +++ b/bin/minindn @@ -479,7 +479,7 @@ if __name__ == '__main__': hosts_conf = [] links_conf = [] - signal.signal(signal.SIGINT, signal_handler) + signal.signal(signal.SIGQUIT, signal_handler) options = parse_args() diff --git a/docs/GETTING-STARTED.md b/docs/GETTING-STARTED.md index 8368f13..b4c1f18 100644 --- a/docs/GETTING-STARTED.md +++ b/docs/GETTING-STARTED.md @@ -44,6 +44,10 @@ To exit Mini-NDN, type `quit` in the CLI: mini-ndn> quit +Another option to quit Mini-NDN is sending a SIGQUIT (ctrl+\). SIGINT (ctrl+c) +is reserved for the purpose of stopping applications initiated on the minindn command +line. + For a more in depth explanation of the CLI, please see the [Mininet Walkthrough](http://mininet.org/walkthrough/). diff --git a/ndn/nfd.py b/ndn/nfd.py index b643e76..3e3e9da 100644 --- a/ndn/nfd.py +++ b/ndn/nfd.py @@ -59,7 +59,7 @@ class Nfd(NdnApplication): node.cmd("export HOME=%s" % node.homeFolder) def start(self): - NdnApplication.start(self, "nfd --config %s >> %s 2>&1 &" % (self.confFile, self.logFile)) + NdnApplication.start(self, "setsid nfd --config %s >> %s 2>&1 &" % (self.confFile, self.logFile)) time.sleep(2) def setStrategy(self, name, strategy):