Author: jfthomps
Date: Thu Mar 15 19:58:26 2012
New Revision: 1301172
URL: http://svn.apache.org/viewvc?rev=1301172&view=rev
Log:
corrected some error messages
added fix for receiving x86_64 as the arch, and if so, treat it as x86 so that
symlinks do not need to be created
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=1301172&r1=1301171&r2=1301172&view=diff
==============================================================================
--- incubator/vcl/sandbox/xcat2partimageng/partimageng.pm (original)
+++ incubator/vcl/sandbox/xcat2partimageng/partimageng.pm Thu Mar 15 19:58:26
2012
@@ -137,8 +137,12 @@ sub mkinstall
}
my $os = $ent->{os};
my $arch = $ent->{arch};
+ if ( $arch eq "x86_64" ) {
+ $arch = "x86";
+ }
+
my $profile = $ent->{profile};
- # check for /install/image/$arch/$profile
+ # check for /install/image/$arch/$profile
unless (-r "$installroot/image/$arch/$profile.img" or
-r "$installroot/image/$arch/$profile.gz" or
-r "$installroot/image/$arch/$profile-parta1.gz")
@@ -328,7 +332,7 @@ sub mkinstall
{
$callback->(
{
- error => ["vmlinuz and initrd.img not found at
/tftpboot/xcat/image/$arch"],
+ error => ["missing one or more of
/tftpboot/xcat/image/$arch/vmlinuz, /tftpboot/xcat/image/$arch/initrd.img,
$installroot/image/$arch/installer_files/rootimg.gz "],
errorcode => [1]
}
);
@@ -378,6 +382,9 @@ sub mkimage
}
my $os = $ent->{os};
my $arch = $ent->{arch};
+ if ( $arch eq "x86_64" ) {
+ $arch = "x86";
+ }
my $profile = $ent->{profile};
# check for /install/image/$arch/$profile
if (-r "$installroot/image/$arch/$profile.img")
@@ -545,7 +552,7 @@ sub mkimage
{
$callback->(
{
- error => ["vmlinuz and initrd.img not found at
/tftpboot/xcat/image/$arch"],
+ error => ["missing one or more of
/tftpboot/xcat/image/$arch/vmlinuz, /tftpboot/xcat/image/$arch/initrd.img,
$installroot/image/$arch/installer_files/rootimg.gz "],
errorcode => [1]
}
);
