svn commit: r981953 - /incubator/vcl/sandbox/xcat2partimageng/partimageng

[jf...@apache.org]

Author: jfthomps
Date: Tue Aug  3 16:19:00 2010
New Revision: 981953

URL: http://svn.apache.org/viewvc?rev=981953&view=rev
Log:
added 'unalias ls' in case it is aliased to 'ls --color'

changed partimage command to use -B mode instead of -b
  - this may require an updated rootimg.gz that contains a more recent partimage version

added modprobe mptspi

modified mount command for NFS to mount $IMAGELIBSERVER:$IMAGELIBINSTALLDIR instead of $MASTER:/install so that the image can mount nfs storage other than just the management node

increased sleep time after running listener.py from 3 seconds to 10 (I don't remember why)

Modified:
    incubator/vcl/sandbox/xcat2partimageng/partimageng

Modified: incubator/vcl/sandbox/xcat2partimageng/partimageng
URL: http://svn.apache.org/viewvc/incubator/vcl/sandbox/xcat2partimageng/partimageng?rev=981953&r1=981952&r2=981953&view=diff
==============================================================================
--- incubator/vcl/sandbox/xcat2partimageng/partimageng (original)
+++ incubator/vcl/sandbox/xcat2partimageng/partimageng Tue Aug  3 16:19:00 2010
@@ -1,5 +1,6 @@
 #!/bin/bash
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin
+unalias ls
 
 partimageinstall () {
     # based on install.sh from xcat 1.3 by Egan Ford
@@ -43,7 +44,7 @@ partimageinstall () {
         echo running partimage$OLD -b -f3 restore /dev/$PARTNAME $INPUTFILE
         logger -t xcat "running partimage$OLD -b -f3 restore /dev/$PARTNAME $INPUTFILE"
         sleep 5
-        if ! partimage$OLD -b -f3 restore /dev/$PARTNAME $INPUTFILE; then
+        if ! partimage$OLD -B x=x -f3 restore /dev/$PARTNAME $INPUTFILE 2>> /tmp/partimageng ; then
             echo partimage exited with a non-zero status, failing
             logger -t xcat "partimage exited with a non-zero status, failing"
             return 1
@@ -131,6 +132,7 @@ modprobe scsi_transport_sas
 modprobe mptbase
 modprobe mptscsih
 modprobe mptsas
+modprobe mptspi
 
 # check for problem of $MASTER being an unknown host
 if ! ping -c 1 $MASTER &> /dev/null; then
@@ -139,7 +141,7 @@ if ! ping -c 1 $MASTER &> /dev/null; the
     /sbin/reboot
     exit
 fi
-mount -o nfsvers=3,tcp,nolock,rw $MASTER:/install /install
+mount -o nfsvers=3,tcp,nolock,rw $IMAGELIBSERVER:$IMAGELIBINSTALLDIR /install
 
 reboot=''
 usepartimageng=0 # this controls what is used to save images
@@ -168,7 +170,7 @@ done
 
 /install/image/x86/installer_files/listener.py &
 
-sleep 3
+sleep 10
 
 devices=`ls -l /dev/disk/by-id | awk '{print $11}'`
 logger -t xcat "disks: $devices"