From a4a1706d4444d8bc335c917ef23017b3006a8c45 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 17 Aug 2016 21:49:38 -0400
Subject: [PATCH] fix bug #1717 [fvt]2.12.2 xcatprobe osdeploy -n could not
 monitor the node deploy process if message's log : dhcp[process id]

---
 xCAT-probe/subcmds/osdeploy | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xCAT-probe/subcmds/osdeploy b/xCAT-probe/subcmds/osdeploy
index 049d125af..969941453 100755
--- a/xCAT-probe/subcmds/osdeploy
+++ b/xCAT-probe/subcmds/osdeploy
@@ -763,7 +763,7 @@ Start capturing every message during OS provision process......
                     if ($hdl == \*VARLOGMSGFILE) {
                         chomp($line = <VARLOGMSGFILE>);
                         my @tmp = split(/\s+/, $line);
-                        if ($tmp[4] =~ /dhcpd:/i && $line =~ /$installnic/) {
+                        if ($tmp[4] =~ /dhcpd/i && $line =~ /$installnic/) {
                             handle_dhcp_msg("$line");
                         } elsif ($tmp[4] =~ /in.tftpd/i) {
                             handle_tftp_msg("$line");
@@ -848,7 +848,7 @@ sub get_valid_logs {
         }
 
         my $ishttplog = 0;
-        $ishttplog = 1 if ($filename =~ /access[\._]log/);
+        $ishttplog = 1 if ($filename =~ /access/);
 
         foreach my $file (@rotatefiles) {
             my $fd;
@@ -929,7 +929,7 @@ sub get_valid_logs {
                     $timestampepoch = probe_utils->convert_to_epoch_seconds($timestamp, $year, $epoch_seconds_of_now);
                 }
 
-                if (($splitline[4] =~ /dhcpd:/i && $_ =~ /$installnic/)
+                if (($splitline[4] =~ /dhcpd/i && $_ =~ /$installnic/)
                     || ($splitline[4] =~ /in.tftpd/i)
                     || (($splitline[4] =~ /^xcat/i) || ($splitline[5] =~ /^xcat/i))
                     || ($splitline[5] =~ /GET/ && $splitline[7] =~ /HTTP/)) {
@@ -968,7 +968,7 @@ sub do_replay {
     foreach my $line (@bthistory) {
         $line =~ s/(\d+) (.+)/$2/g;
         my @tmp = split(/\s+/, $line);
-        if ($tmp[4] =~ /dhcpd:/i && $line =~ /$installnic/) {
+        if ($tmp[4] =~ /dhcpd/i && $line =~ /$installnic/) {
             handle_dhcp_msg("$line");
         } elsif ($tmp[4] =~ /in.tftpd/i) {
             handle_tftp_msg("$line");