xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-29 15:51:18 +00:00
Code Issues Releases Wiki Activity

Fix Debian and SLES rootimg.gz compatibility

Browse Source 
Do not require repacking of a rootimage if the
environment has the 'old style' packed image.
This commit is contained in:
Jarrod Johnson
2016-11-09 11:24:58 -05:00
parent e7a7da10cb
commit 967dd0f5fb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-server/lib/xcat/plugins/debian.pm
View File

@@ -1171,6 +1171,7 @@ sub mknetboot
$platform = xCAT_plugin::debian::getplatform($osver);
my $suffix = 'cpio.gz';
$suffix = 'gz' if (-r "$rootimgdir/rootimg.gz");
$suffix = 'cpio.xz' if (-r "$rootimgdir/rootimg.cpio.xz");
$suffix = 'tar.gz' if (-r "$rootimgdir/rootimg.tar.gz");
$suffix = 'tar.xz' if (-r "$rootimgdir/rootimg.tar.xz");
@@ -1223,7 +1224,7 @@ sub mknetboot
copy("$rootimgdir/initrd.gz", "$rootimgdir/initrd-stateless.gz");
}
}
unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs") {
unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs" or -r "$rootimgdir/rootimg.gz") {
$callback->({
error => ["No packed image for platform $osver, architecture $arch, and profile $profile, please run packimage (e.g. packimage -o $osver -p $profile -a $arch"],
errorcode => [1] });

3
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -329,6 +329,7 @@ sub mknetboot
my $suffix = 'cpio.gz';
$suffix = 'sfs' if (-r "$rootimgdir/rootimg.sfs");
$suffix = 'gz' if (-r "$rootimgdir/rootimg.gz");
$suffix = 'cpio.xz' if (-r "$rootimgdir/rootimg.cpio.xz");
$suffix = 'tar.gz' if (-r "$rootimgdir/rootimg.tar.gz");
$suffix = 'tar.xz' if (-r "$rootimgdir/rootimg.tar.xz");
@@ -383,7 +384,7 @@ sub mknetboot
}
}
unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs") {
unless (-r "$rootimgdir/rootimg.cpio.gz" or -r "$rootimgdir/rootimg.cpio.xz" or -r "$rootimgdir/rootimg.tar.gz" or -r "$rootimgdir/rootimg.tar.xz" or -r "$rootimgdir/rootimg.sfs" or -r "$rootimgdir/rootimg.gz") {
$callback->({
error => [qq{No packed image for platform $osver, architecture $arch, and profile $profile, please run packimage before nodeset}],
errorcode => [1]