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

bug fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7508 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2010-09-17 18:12:25 +00:00
parent 2480d30d31
commit d3b2c73a23
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/share/xcat/netboot/rh/genimage
View File

@ -178,13 +178,13 @@ if (@ARGV > 0 and $needUpdateTable eq 1) {
} else {
$kernelver = $ref_linuximage_tab->{'kernelver'};
}
if ($ndrivers) {
if ($ndrivers ne $ref_linuximage_tab->{'netdrivers'}) {
if ($netdriver) {
if ($netdriver ne $ref_linuximage_tab->{'netdrivers'}) {
print "The netdrivers are different from the value in linuximage table, will update it\n";
$updates{'netdrivers'} = $ndrivers;
$updates{'netdrivers'} = $netdriver;
}
} else {
$ndrivers = $ref_linuximage_tab->{'netdrivers'};
$netdriver = $ref_linuximage_tab->{'netdrivers'};
}
if ($permission) {
if ($permission ne $ref_linuximage_tab->{'permission'}) {

11
xCAT-server/share/xcat/netboot/sles/genimage
View File

@ -198,13 +198,13 @@ if (@ARGV > 0 and $needUpdateTable eq 1) {
$kernelver = $ref_linuximage_tab->{'kernelver'};
}
if ($ndrivers) {
if ($ndrivers ne $ref_linuximage_tab->{'netdrivers'}) {
if ($netdriver) {
if ($netdriver ne $ref_linuximage_tab->{'netdrivers'}) {
print "The netdrivers are different from the value in linuximage table, will update it\n";
$updates{'netdrivers'} = $ndrivers;
$updates{'netdrivers'} = $netdriver;
}
} else {
$ndrivers = $ref_linuximage_tab->{'netdrivers'};
$netdriver = $ref_linuximage_tab->{'netdrivers'};
}
if ($permission) {
@ -238,8 +238,7 @@ $updates{'rootimgdir'} = $destdir if ($needUpdateTable);
$rootimg_dir="$destdir/rootimg";
unless ($osver and $profile and $netdriver and $prinic) {
unless ($osver and $profile) {
print 'Usage: genimage -i <nodebootif> -n <nodenetdrivers> [-r <otherifaces>] -k <KERNELVER> -o <OSVER> -p <PROFILE> [-a <ARCH>] [-l rootlimitsize] [-t tmplimitsize] [--permission <permission>]'."\n";
print ' genimage [-i <nodebootif>] [-n <nodenetdrivers>] [-r <otherifaces>] [-k <KERNELVER>] [-o <OSVER>] [-p <PROFILE>] [-a <ARCH>] [-l rootlimitsize] [-t tmplimitsize] [--permission <permission>] <imagename>'."\n";
print " --permission is used for statelite only\n";