Author: jfthomps
Date: Tue Aug 3 17:11:47 2010
New Revision: 981968
URL: http://svn.apache.org/viewvc?rev=981968&view=rev
Log:
added installnic to kernel cmdline parameters so that the private nic can be
configured in the xcat tables on a per node basis instead of having it hard
coded in initrd.img and rootimg.gz
Modified:
incubator/vcl/sandbox/xcat2partimageng/partimageng.pm
Modified: incubator/vcl/sandbox/xcat2partimageng/partimageng.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/sandbox/xcat2partimageng/partimageng.pm?rev=981968&r1=981967&r2=981968&view=diff
==============================================================================
--- incubator/vcl/sandbox/xcat2partimageng/partimageng.pm (original)
+++ incubator/vcl/sandbox/xcat2partimageng/partimageng.pm Tue Aug 3 17:11:47
2010
@@ -238,6 +238,7 @@ sub mkinstall
);
next;
}
+ my $installnic = $ent->{installnic};
# determine image server, if tftpserver use it, else use xcatmaster
@@ -287,7 +288,7 @@ sub mkinstall
next;
}
- my $kcmdline =
"imgurl=http://$imgsrv/$installroot/image/$arch/installer_files/rootimg.gz
image=$installroot/image/$arch/$profile.img blocks=512 action=restore reboot "
. $ent->{kcmdline};
+ my $kcmdline =
"imgurl=http://$imgsrv/$installroot/image/$arch/installer_files/rootimg.gz
image=$installroot/image/$arch/$profile.img blocks=512 action=restore
installnic=$installnic reboot " . $ent->{kcmdline};
if (defined($sent->{serialport}))
{
@@ -454,6 +455,7 @@ sub mkimage
);
next;
}
+ my $installnic = $ent->{installnic};
# determine image server, if tftpserver use it, else use xcatmaster
@@ -503,7 +505,7 @@ sub mkimage
next;
}
- my $kcmdline =
"imgurl=http://$imgsrv/$installroot/image/$arch/installer_files/rootimg.gz
image=$installroot/image/$arch/$profile.img blocks=512 action=save reboot " .
$ent->{kcmdline};
+ my $kcmdline =
"imgurl=http://$imgsrv/$installroot/image/$arch/installer_files/rootimg.gz
image=$installroot/image/$arch/$profile.img blocks=512 action=save
installnic=$installnic reboot " . $ent->{kcmdline};
if (defined($sent->{serialport}))
{
