add addkcmdline support to ubuntu

Signed-off-by: Arif Ali <mail@arif-ali.co.uk>

xCAT-client/bin/pgsqlsetup

@@ -180,7 +180,8 @@ if ($::RUNCMD_RC != 0)
     exit(1);
 }
 # check if 9.X release not built by us is installed,  setup different
-if  (grep(/postgresql9/, @output)) {  # postgresql 9.x
+# SLES used default dir
+if  ( (grep(/postgresql9/, @output)) && ($::linuxos !~ /sles/) ){  # postgresql 9.x
  # figure out which 9.x release  and build path
  my @parseout= split(/\-/, $output[0]);
  my @ptflevel= split ("postgresql9",$parseout[0]);
@@ -986,7 +987,7 @@ sub setupxcatdb
       $cmd = "/var/lib/pgsql/bin/psql -d $::dbname -U postgres";
     } else {  # Linux
        $cmd = "$::pgcmddir/psql -d $::dbname -U postgres";
-       if ($debianflag){
+       if ( ($debianflag) || ($::linuxos =~ /sles/) ){
            $cmd = "su - postgres -c '$::pgcmddir/psql -d $::dbname -U postgres'";
        }
     }

xCAT-client/bin/rcons

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Provide serial console access to nodes
 

xCAT-server/share/xcat/install/scripts/post.ubuntu

@@ -191,7 +191,13 @@ if [[ -r /boot/grub/menu.lst ]]; then
 sed -i 's/^serial/#serial/' /boot/grub/menu.lst
 sed -i 's/^terminal/#terminal/' /boot/grub/menu.lst
 elif [[ -r /boot/grub/grub.cfg ]] ; then
-update-grub
+UPDATEGRUB=1
+fi
+export PROVMETHOD=#TABLE:nodetype:THISNODE:provmethod#
+export KERNELARGS=#TABLE:linuximage:$PROVMETHOD:addkcmdline#
+if [[ -n $KERNELARGS ]] ; then
+  sed -i "s/\(GRUB_CMDLINE_LINUX=\).*/\1\"$KERNELARGS\"/" /etc/default/grub
+  UPDATEGRUB=1
 fi
 if echo "$ARCH" | grep -i 'ppc64'; then
     CONSOLE="hvc$CONSOLEPORT"
@@ -200,7 +206,7 @@ if echo "$ARCH" | grep -i 'ppc64'; then
     else
         echo "GRUB_CMDLINE_LINUX_DEFAULT=\"console=$CONSOLE\"" > /etc/default/grub
     fi
-    update-grub
+    UPDATEGRUB=1
 
 cat >/etc/init/$CONSOLE\.conf << 'EOF'
 start on stopped rc RUNLEVEL=[2345] and (not-container or container container CONTAINER=lxc or container CONTAINER=lxc-libvirt)
@@ -220,6 +226,9 @@ script
 end script
 EOF
 fi
+if [[ $UPDATEGRUB -eq 1 ]]; then
+  update-grub
+fi
 sed -i 's/\(deb.*security.*\)/#\1/' /etc/apt/sources.list
 #iso does not contains source deb packages
 sed -i 's/^\(\s*deb-src.*install.*\)$/#\1/g' /etc/apt/sources.list

xCAT/postscripts/xcatinstallpost

@@ -20,7 +20,7 @@ until ip -4 --oneline addr show|grep -v 127.0.0.1 >/dev/null
 do
     sleep 2
     RETRY=$[ $RETRY + 1 ]
-    if [ $RETRY -eq 15  ];then
+    if [ $RETRY -eq 90  ];then
        logger -t xcat -p local4.err "Network not configured, please check..."
        echo `date` "xcatinstallpost: Network not configured, please check..." >> /var/log/xcat/xcat.log 
        exit 1