From f1e4a15d4ef13b9f6f7002ab94c1735f19b2ed8b Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 3 May 2013 21:06:54 +0000
Subject: [PATCH] Fixes for ubuntu enhancements

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16181 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/debian.pm            |  2 +-
 xCAT-server/share/xcat/install/scripts/pre.ubuntu | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm
index 61a7b622a..dcdf10f94 100644
--- a/xCAT-server/lib/xcat/plugins/debian.pm
+++ b/xCAT-server/lib/xcat/plugins/debian.pm
@@ -770,7 +770,7 @@ sub mkinstall
 	    #}
 	        
 	    $kcmdline .= " xcatd=".$instserver;
-	    $kcmdline .= " mirror/http/hostname=".$instserver;
+#	    $kcmdline .= " mirror/http/hostname=".$instserver;
             if ($maxmem) {
                 $kcmdline.=" mem=$maxmem";
             }
diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
index 0f1cd4cef..95c95ece9 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu
+++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu
@@ -4,11 +4,17 @@ if [ ! -c /dev/vcs ]; then
     mknod /dev/vcs c 7 0
 fi
 
+while [ -z "$instdisk" ]; do
+VIRTDISKS=`ls /dev/vd*|wc -l`
+if [ $VIRTDISKS -gt 0 ]; then 
 for disk in /dev/vd*[^0-9]; do
 	if [ -z "$firstdirectdisk" ]; then firstdirectdisk=$disk; fi #remember first disk as a guess of medium resort
 	#no edd_id in debian installer, no edd hints supported
 done
+fi
 if [ -z "$firstdirectdisk" ]; then
+	SCSIDISKS=`ls /dev/sd*|wc -l`
+	if [ $SCSIDISKS -gt 0 ]; then 
 	for disk in /dev/sd*[^0-9]; do
 		currdriver=`udevadm info --attribute-walk --name $disk |grep DRIVERS|grep -v '""'|grep -v '"sd"'|head -n 1|sed -e 's/[^"]*"//' -e 's/"//'`
 		case "$currdriver" in
@@ -23,6 +29,7 @@ if [ -z "$firstdirectdisk" ]; then
 				;;
 		esac
 	done
+	fi
 fi
 if [ -z "$instdisk" ]; then
         if [ ! -z "$firstdirectdisk" ]; then
@@ -33,7 +40,9 @@ if [ -z "$instdisk" ]; then
                 instdisk=$firstdisk
         fi
 fi
-debconf-set partman-auto/disk "$instdisk"
+if [ ! -z "$instdisk" ]; then debconf-set partman-auto/disk "$instdisk"; fi
+sleep 0.1
+done &