From 5d45460c1bc9eab15cbab880465065cc21e6e207 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Tue, 28 Jun 2016 22:17:04 -0400 Subject: [PATCH] modify depending on xiaopeng's new comments --- xCAT-probe/subcmds/discovery | 6 +++++- xCAT-probe/xcatprobe | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery index 59791c9f5..7e9e232ed 100755 --- a/xCAT-probe/subcmds/discovery +++ b/xCAT-probe/subcmds/discovery @@ -814,7 +814,11 @@ sub do_monitor { $SIG{TERM} = $SIG{INT} = sub { $terminal = 1; }; - + + #check pre_defined node should be done during "do_pre_check" part. + #if we use '--noprecheck' to skip pre_check(include pre_defined node checking) + #then go to monitor directly, we should do pre_defined node checking + #here if noderange and discovery_type are specified. if ($no_pre_check && defined($noderange) && defined($discovery_type)) { $msg = "All pre_defined nodes are valid"; my $rc = check_pre_defined_node($discovery_type, $noderange); diff --git a/xCAT-probe/xcatprobe b/xCAT-probe/xcatprobe index 2ed2da37d..9e25e8da4 100755 --- a/xCAT-probe/xcatprobe +++ b/xCAT-probe/xcatprobe @@ -189,7 +189,7 @@ sub listvalidsubcmd { } $maxlen += 4; - my $desiredwidth = 100; + my $desiredwidth = 120; my $screenwidth = (`tput cols` + 0); my $finallen = ($screenwidth > $desiredwidth ? $desiredwidth : $screenwidth);