diff --git a/xCAT-server/sbin/runsqlcmd b/xCAT-server/sbin/runsqlcmd
index b98505dc6..a86a06495 100755
--- a/xCAT-server/sbin/runsqlcmd
+++ b/xCAT-server/sbin/runsqlcmd
@@ -35,8 +35,6 @@ use strict;
 # Main
 
 $::progname = "runsqlcmd";
-my $args = join ' ', @ARGV;
-$::command = "$0 $args";
 Getopt::Long::Configure("bundling");
 $Getopt::Long::ignorecase = 0;
 my ($directory, $help, $version, $filelist);
@@ -54,6 +52,9 @@ if (
     &usage;
     exit(1);
 }
+# see if they entered a command
+my $args = join ' ', @ARGV;
+my $command =  $args;
 
 # display the usage if -h or --help is specified
 if ($help)
@@ -73,10 +74,31 @@ if (($filelist) && ($directory))
     xCAT::MsgUtils->message("E","Cannot enter both the -f and -d flags.");
     exit 1;
 }
-if (!($filelist)) { # if no file list and no directory set default
-   if (!($directory)) {
-      $directory = "$::XCATROOT/lib/perl/xCAT_schema";  
-   }
+if (($command) && (($directory) || ($filelist)))
+{
+    xCAT::MsgUtils->message("E","Cannot enter both a command and the -d or -f flag.");
+    exit 1;
+}
+my $tempfile;
+if ($command) { # command on command line
+     $tempfile="/tmp/runcmdfile.$$"; 
+     my $cmd = "echo \"$command\"  > $tempfile";
+     xCAT::Utils->runcmd($cmd,0);
+     if ($::RUNCMD_RC != 0)
+     {    # error
+            xCAT::MsgUtils->message("E", "$cmd failed");
+            exit 1;
+
+     }
+     # put on filelist
+     $filelist=$tempfile;
+} else {  # commands in a file
+
+  if (!($filelist)) { # if no file list and no directory set default
+     if (!($directory)) {
+        $directory = "$::XCATROOT/lib/perl/xCAT_schema";  
+     }
+  }
 }
 
 my @filearray;
@@ -97,10 +119,11 @@ else
 }
 my @sqlfilelist = xCAT::Table->get_filelist($directory, \@filearray, "sql");
 
-# determine database
-my $xcatcfg = xCAT::Table->get_xcatcfg();
-foreach my $file (@sqlfilelist)
-{
+if (@sqlfilelist) {  # if anything to do
+  #determine database
+  my $xcatcfg = xCAT::Table->get_xcatcfg();
+  foreach my $file (@sqlfilelist)
+  {
     if ($xcatcfg =~ /^DB2:/)
     {
         &rundb2cmd($file);
@@ -121,8 +144,20 @@ foreach my $file (@sqlfilelist)
         exit 1;
     }
 
+  }
+} else {
+        xCAT::MsgUtils->message("SE", "The runsqlcmd has no files to process in $directory .");
 }
+if ($tempfile) {
+     my $cmd = "rm $tempfile";
+     xCAT::Utils->runcmd($cmd,0);
+     if ($::RUNCMD_RC != 0)
+     {    # error
+            xCAT::MsgUtils->message("E", "$cmd failed");
+            exit 1;
 
+     }
+}   
 exit 0;
 
 #####################################
@@ -143,10 +178,10 @@ sub usage
 {
     xCAT::MsgUtils->message(
         'I',
-        "Usage:\nRuns the sql commands in files located in /opt/xcat/lib/perl/xCAT_schema by default or the directory input with -d or the list of files input with the -f flag. Supports DB2,PostgreSQL,MySQL."
+        "Usage:\nRuns the sql commands in files located in /opt/xcat/lib/perl/xCAT_schema by default, or the directory input with -d, or the list of files input with the -f flag, or the command input on the command line. Supports DB2,PostgreSQL,MySQL."
         );
     my $msg =
-      "runsqlcmd  <-h|--help>\n           <-v|--version>\n           <-d|--dir>\n           <-f|--files>\n";
+      "runsqlcmd  <-h|--help>\n           <-v|--version>\n           <-d|--dir>\n           <-f|--files>  \n           <sql command>";
 
     xCAT::MsgUtils->message('I', "$msg");
 }
@@ -167,6 +202,11 @@ sub rundb2cmd
     use File::Basename;
     my $file     = shift;
     my $rc       = 0;
+    if (!(-e $file)) {  # file does not exist
+        xCAT::MsgUtils->message("SE",
+            "The file:$file does not exist. ");
+        return;
+    }
     my $filename = basename($file);                # strip filename
     my $tmpfile  = "/tmp/" . $filename . ".tmp";
 
@@ -233,9 +273,15 @@ sub runmysqlcmd
     my ($hostind, $hostname) = split('=', $host);
 
     my $rc  = 0;
+    if (!(-e $file)) {  # file does not exist
+        xCAT::MsgUtils->message("SE",
+            "The file:$file does not exist. ");
+        return;
+    }
+    
     my $cmd =
       "mysql --user=$admin --password=$passwd --host=$hostname $dbname \< $file   ";
-    xCAT::MsgUtils->message("SI", "Running mysql --user=$admin --host=$hostname $dbname $file ");
+    #xCAT::MsgUtils->message("SI", "Running mysql --user=$admin --host=$hostname $dbname $file ");
     system("$cmd");
 
     if ($? > 0)    # error
@@ -268,9 +314,14 @@ sub runpgsqlcmd
     my ($hostind, $hostname) = split('=', $host);
 
     my $rc  = 0;
+    if (!(-e $file)) {  # file does not exist
+        xCAT::MsgUtils->message("SE",
+            "The file:$file does not exist. ");
+        return;
+    }
     my $cmd =
       "PGPASSWORD=$passwd psql -d $dbname -h $hostname -U $admin -f $file   ";
-    xCAT::MsgUtils->message("SI", "Running psql -d $dbname -h $hostname -U $admin -f $file ");
+    #xCAT::MsgUtils->message("SI", "Running psql -d $dbname -h $hostname -U $admin -f $file ");
     system("$cmd");
 
     if ($? > 0)    # error