From 87e26ef931ee6063332ceba77db472140f832d3a Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Fri, 2 Jun 2017 14:11:36 -0700 Subject: [PATCH] Restore CLI=MyCLI customization in --custom files fixes #746 --- bin/mn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/mn b/bin/mn index 385bdfb..32272a2 100755 --- a/bin/mn +++ b/bin/mn @@ -314,6 +314,8 @@ class MininetRunner( object ): def begin( self ): "Create and run mininet." + global CLI + opts = self.options if opts.cluster: @@ -385,7 +387,8 @@ class MininetRunner( object ): if opts.ensure_value( 'nat', False ): mn.addNAT( *opts.nat_args, **opts.nat_kwargs ).configDefault() - CLI = mininet.cli.CLI + # --custom files can set CLI or change mininet.cli.CLI + globals().setdefault( 'CLI', mininet.cli.CLI ) if opts.pre: CLI( mn, script=opts.pre )