From 8eed74d183f15afaae93c4c6bfe3c1a282bf85ae Mon Sep 17 00:00:00 2001 From: daniceexi Date: Thu, 28 Jul 2011 10:21:12 +0000 Subject: [PATCH] defect 3374036: change to get the path of rootimg from osimage table git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10181 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 3 ++- xCAT-server/lib/xcat/plugins/debian.pm | 2 +- xCAT-server/lib/xcat/plugins/sles.pm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 665494b24..7301a339e 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -40,6 +40,7 @@ my %distnames = ( "1272326751.405938" => "centos5.5", "1195488871.805863" => "centos4.6", "1195487524.127458" => "centos4.6", + "1301444731.448392" => "centos5.6", "1170973598.629055" => "rhelc5", "1170978545.752040" => "rhels5", "1192660014.052098" => "rhels5.1", @@ -620,7 +621,7 @@ sub mknetboot } else { $kcmdline = - "imgurl=http://$imgsrv/install/netboot/$osver/$arch/$profile/rootimg.$suffix "; + "imgurl=http://$imgsrv/$rootimgdir/rootimg.$suffix "; $kcmdline .= "XCAT=$xcatmaster:$xcatdport "; } diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index 126b36da8..d5ce595b7 100644 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -1099,7 +1099,7 @@ sub mknetboot else { $kcmdline = - "imgurl=http://$imgsrv/install/netboot/$osver/$arch/$profile/rootimg.$suffix "; + "imgurl=http://$imgsrv/$rootimgdir/rootimg.$suffix "; } if (defined $sent->{serialport}) { diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index 02759bfa4..8e34997bd 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -426,7 +426,7 @@ sub mknetboot else { $kcmdline = - "imgurl=http://$imgsrv/install/netboot/$osver/$arch/$profile/rootimg.$suffix "; + "imgurl=http://$imgsrv/$rootimgdir/rootimg.$suffix "; } $kcmdline .= "XCAT=$xcatmaster:$xcatdport ";