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

ubuntu 13.04 stateful support

Browse Source
This commit is contained in:
xq2005 2013-09-27 02:56:44 -07:00
parent 09fe6d5c8f
commit d856b6caf4
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -770,7 +770,7 @@ sub mkinstall
# . $node;
#} else
#{
my $kcmdline = "quiet auto url=http://"
my $kcmdline = "nofb utf8 auto url=http://"
. $instserver
. "/install/autoinst/"
. $node;
@ -831,7 +831,7 @@ sub mkinstall
#}
# need to add these in, otherwise aptitude will ask questions
$kcmdline .= " locale=en_US console-setup/layoutcode=us";
$kcmdline .= " locale=en_US";
#$kcmdline .= " netcfg/wireless_wep= netcfg/get_hostname= netcfg/get_domain=";
# default answers as much as possible, we don't want any interactiveness :)
@ -849,11 +849,16 @@ sub mkinstall
#$kcmdline .= " DEBCONF_DEBUG=5";
# I don't need the timeout for ubuntu, but for debian there is a problem with getting dhcp in a timely manner
$kcmdline .= " netcfg/dhcp_timeout=120";
# safer way to set hostname, avoid problems with nameservers
$kcmdline .= " hostname=".$node;
#from 12.10, the live install changed, so add the live-installer
if ( -r "$pkgdir/install/filesystem.squashfs")
{
$kcmdline .= " live-installer/net-image=http://${instserver}${pkgdir}/install/filesystem.squashfs";
}
$bptab->setNodeAttribs(
$node,
{

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

@ -41,6 +41,7 @@ if [ -z "$instdisk" ]; then
fi
fi
if [ ! -z "$instdisk" ]; then debconf-set partman-auto/disk "$instdisk"; fi
debconf-get open-iscsi/targets > /tmp/q
sleep 0.1
done &

4
xCAT-server/share/xcat/install/ubuntu/compute.tmpl
View File

@ -5,14 +5,14 @@ d-i localechooser/supported-locales multiselect en_US.UTF-8
# Keyboard Selection
d-i console-setup/ask_detect boolean false
d-i console-setup/layoutcode string en
d-i keyboard-configuration/layoutcode string en
### Network Configuration
d-i netcfg/get_hostname string unassigned-hostname
d-i netcfg/get_domain string unassigned-domain
d-i netcfg/wireless_wep string
d-i netcfg/dhcp_timeout string 120
### Mirror settings
# If you select ftp, the mirror/country string does not need to be set.

4
xCAT-server/share/xcat/install/ubuntu/kvm.tmpl
View File

@ -5,14 +5,14 @@ d-i localechooser/supported-locales multiselect en_US.UTF-8
# Keyboard Selection
d-i console-setup/ask_detect boolean false
d-i console-setup/layoutcode string en
d-i keyboard-configuration/layoutcode string en
### Network Configuration
d-i netcfg/get_hostname string unassigned-hostname
d-i netcfg/get_domain string unassigned-domain
d-i netcfg/wireless_wep string
d-i netcfg/dhcp_timeout string 120
### Mirror settings
# If you select ftp, the mirror/country string does not need to be set.