From 4635fcb730c2b033d14d045dc34ec43f6d433f66 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Wed, 5 Jul 2017 04:33:40 +0000
Subject: [PATCH 1/3] Utils::servicemap: Correct formatting of `%svchash`

---
 perl-xCAT/xCAT/Utils.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index ea107f482..29969d381 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -4017,14 +4017,14 @@ sub servicemap {
     # (general service name) => {list of possible service names}
     #
     my %svchash = (
-        "dhcp" => [ "dhcp3-server", "dhcpd", "isc-dhcp-server" ],
-        "nfs" => [ "nfsserver", "nfs-server", "nfs", "nfs-kernel-server" ],
-        "named"     => [ "named",    "bind9" ],
-        "syslog"    => [ "syslog",   "syslogd", "rsyslog" ],
-        "firewall"  => [ "iptables", "firewalld", "ufw" ],
-        "http"      => [ "apache2",  "httpd" ],
-        "ntpserver" => [ "ntpd",     "ntp" ],
-        "mysql"     => [ "mysqld",   "mysql" ],
+        "dhcp"      => [ "dhcp3-server", "dhcpd", "isc-dhcp-server" ],
+        "nfs"       => [ "nfsserver",    "nfs-server", "nfs", "nfs-kernel-server" ],
+        "named"     => [ "named",        "bind9" ],
+        "syslog"    => [ "syslog",       "syslogd", "rsyslog" ],
+        "firewall"  => [ "iptables",     "firewalld", "ufw" ],
+        "http"      => [ "apache2",      "httpd" ],
+        "ntpserver" => [ "ntpd",         "ntp" ],
+        "mysql"     => [ "mysqld",       "mysql" ],
     );
 
     my $path       = undef;

From dd5d2263f6f7f41799aa8004d1ce7606f6b17938 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Wed, 5 Jul 2017 04:35:03 +0000
Subject: [PATCH 2/3] Utils::servicemap: add `mariadb` as alias of `mysql` to
 `%svchash`

---
 perl-xCAT/xCAT/Utils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 29969d381..937a36473 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -4024,7 +4024,7 @@ sub servicemap {
         "firewall"  => [ "iptables",     "firewalld", "ufw" ],
         "http"      => [ "apache2",      "httpd" ],
         "ntpserver" => [ "ntpd",         "ntp" ],
-        "mysql"     => [ "mysqld",       "mysql" ],
+        "mysql"     => [ "mysqld",       "mysql", "mariadb" ],
     );
 
     my $path       = undef;

From ba6b62619e3dd9096b201e943cdf2e06c82e7b47 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Wed, 5 Jul 2017 04:54:44 +0000
Subject: [PATCH 3/3] travis.pl: Show empty travis_env_attrs

---
 travis.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/travis.pl b/travis.pl
index 4c827769a..44ae86cd6 100644
--- a/travis.pl
+++ b/travis.pl
@@ -441,7 +441,11 @@ my @travis_env_attr = ("TRAVIS_REPO_SLUG",
                        "PASSWORD",
                        "PWD");
 foreach (@travis_env_attr){
-    print "$_ = $ENV{$_}\n";
+    if($ENV{$_}) {
+        print "$_ = '$ENV{$_}'\n";
+    } else {
+        print "$_ = ''\n";
+    }
 }
 
 my @os_info = runcmd("cat /etc/os-release");