arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for ubuntu enhancements

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16181 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-05-03 21:06:54 +00:00
parent 12bad57506
commit f1e4a15d4e
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/debian.pm
View File

@ -770,7 +770,7 @@ sub mkinstall
#}
$kcmdline .= " xcatd=".$instserver;
$kcmdline .= " mirror/http/hostname=".$instserver;
# $kcmdline .= " mirror/http/hostname=".$instserver;
if ($maxmem) {
$kcmdline.=" mem=$maxmem";
}

11
xCAT-server/share/xcat/install/scripts/pre.ubuntu
View File

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