bug #1819: Rename --no-kill-i option to --no-kill

diff --git a/ChangeLog b/ChangeLog
index 629ab99dbc259c5e16922b49b40ae2933b684481..b9840be405c4bec3f52778437f2454b4ce17e97e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 411.   [func]          muks
-       Add a -i/--no-kill-i command-line argument to bind10, which stops
+       Add a -i/--no-kill command-line argument to bind10, which stops
        it from sending SIGTERM and SIGKILL to other b10 processes when
        they're shutting down.
        (Trac #1819, git 774554f46b20ca5ec2ef6c6d5e608114f14e2102)

diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index 08d7cfe8f16eaab8662ecc66b9b8d8792f4d9dea..5e1f44eb328a8f1ed6e22025b37b5538c272938a 100755 (executable)
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -1048,7 +1048,7 @@ def parse_args(args=sys.argv[1:], Parser=OptionParser):
                       help="UNIX domain socket file the b10-msgq daemon will use")
     parser.add_option("-n", "--no-cache", action="store_true", dest="nocache",
                       default=False, help="disable hot-spot cache in authoritative DNS server")
-    parser.add_option("-i", "--no-kill-i", action="store_true", dest="nokill",
+    parser.add_option("-i", "--no-kill", action="store_true", dest="nokill",
                       default=False, help="do not send SIGTERM and SIGKILL signals to modules")
     parser.add_option("-u", "--user", dest="user", type="string", default=None,
                       help="Change user after startup (must run as root)")