2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00

Fix backwards compatibility

If a user has an existing rootimg.gz, use that so
that an upgrade does not require re doing packimage for
no particular reason.
This commit is contained in:
Jarrod Johnson 2016-11-09 10:19:10 -05:00
parent e9a4290cec
commit e7a7da10cb

View File

@ -464,6 +464,7 @@ sub mknetboot
$platform = xCAT_plugin::anaconda::getplatform($osver);
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");
@ -515,7 +516,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 found at $rootimgdir/rootimg.gz or $rootimgdir/rootimg.sfs on $myname, please run packimage (e.g. packimage -o $osver -p $profile -a $arch"],
errorcode => [1] });