From daab6a0cde1f58e0d5fdecb907528acdb6dab08f Mon Sep 17 00:00:00 2001 From: xq2005 Date: Fri, 27 Sep 2013 02:51:23 -0700 Subject: [PATCH] ubuntu 13.04 stateful support --- xCAT-server/lib/xcat/plugins/debian.pm | 9 +++++++-- xCAT-server/share/xcat/install/scripts/pre.ubuntu | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index 520ba0635..66ac98d99 100644 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -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, { diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu b/xCAT-server/share/xcat/install/scripts/pre.ubuntu index b6a86c2d1..f6c9efd44 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu +++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu @@ -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 &