3 Commits
master ... 2.9

3 changed files with 5 additions and 4 deletions

View File

@ -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'";
}
}

View File

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

View File

@ -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