From 63fd2d2e97a10b4f254a98e5577b9698a12b0ca0 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 21 Sep 2009 16:00:57 +0000
Subject: [PATCH] -Fix conditional in previous checkin to be valid bourne shell

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4186 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/netboot/rh/genimage   | 2 +-
 xCAT-server/share/xcat/netboot/sles/genimage | 2 +-
 xCAT-server/share/xcat/netboot/suse/genimage | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index e0c28e14e..6371c0c8a 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -590,7 +590,7 @@ sub generic_post { #This function is meant to leave the image in a state approxi
    print $cfgfile "#!/bin/bash\n"; 
    print $cfgfile "for i in `cat /proc/cmdline`; do\n"; 
    print $cfgfile '  KEY=`echo $i|cut -d= -f 1`'."\n";
-   print $cfgfile "  if [ \"\$KEY\" == \"console\" && \"\$i\" != \"console=tty0\" ]; then\n";
+   print $cfgfile "  if [ \"\$KEY\" == \"console\" -a \"\$i\" != \"console=tty0\" ]; then\n";
    print $cfgfile "    VALUE=`echo \$i | cut -d= -f 2`\n"; 
    print $cfgfile "     COTTY=`echo \$VALUE|cut -d, -f 1`\n";
    print $cfgfile "     COSPEED=`echo \$VALUE|cut -d, -f 2|cut -dn -f 1`\n";
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 253142953..082bfad33 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -672,7 +672,7 @@ sub generic_post { #This function is meant to leave the image in a state approxi
    print $cfgfile "#!/bin/bash\n"; 
    print $cfgfile "for i in `cat /proc/cmdline`; do\n"; 
    print $cfgfile '  KEY=`echo $i|cut -d= -f 1`'."\n";
-   print $cfgfile "  if [ \"\$KEY\" == \"console\" && \"\$i\" != \"console=tty0\" ]; then\n";
+   print $cfgfile "  if [ \"\$KEY\" == \"console\" -a \"\$i\" != \"console=tty0\" ]; then\n";
    print $cfgfile "    VALUE=`echo \$i | cut -d= -f 2`\n"; 
    print $cfgfile "     COTTY=`echo \$VALUE|cut -d, -f 1`\n";
    print $cfgfile "     COSPEED=`echo \$VALUE|cut -d, -f 2|cut -dn -f 1`\n";
diff --git a/xCAT-server/share/xcat/netboot/suse/genimage b/xCAT-server/share/xcat/netboot/suse/genimage
index c7148a300..a75da5bac 100755
--- a/xCAT-server/share/xcat/netboot/suse/genimage
+++ b/xCAT-server/share/xcat/netboot/suse/genimage
@@ -672,7 +672,7 @@ sub generic_post { #This function is meant to leave the image in a state approxi
    print $cfgfile "#!/bin/bash\n"; 
    print $cfgfile "for i in `cat /proc/cmdline`; do\n"; 
    print $cfgfile '  KEY=`echo $i|cut -d= -f 1`'."\n";
-   print $cfgfile "  if [ \"\$KEY\" == \"console\" && \"\$i\" != \"console=tty0\" ]; then\n";
+   print $cfgfile "  if [ \"\$KEY\" == \"console\" -a \"\$i\" != \"console=tty0\" ]; then\n";
    print $cfgfile "    VALUE=`echo \$i | cut -d= -f 2`\n"; 
    print $cfgfile "     COTTY=`echo \$VALUE|cut -d, -f 1`\n";
    print $cfgfile "     COSPEED=`echo \$VALUE|cut -d, -f 2|cut -dn -f 1`\n";