Commit 280d35bb authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Fix warnings caused by change to osid fields being set to NULL when not

defined (since they are are now integers).
parent d609e01b
......@@ -330,15 +330,21 @@ foreach my $n (@freed_nodes) {
$error++;
next;
}
my $result = DBQueryFatal("select mustclean from os_info ".
"where osid='$def_boot_osid'");
my ($clean) = $result->fetchrow_array();
#
# See if the OS it was running was marked as mustclean or not. Basically,
# this is an OSKit hack to avoid reloading disks that have not been
# touched by the kernel. If a def_boot_path was set, there is nothing
# we can figure out, so just reload it. This needs to be more general
# purpose.
#
my $clean;
if (defined($def_boot_osid)) {
my $result = DBQueryFatal("select mustclean from os_info ".
"where osid='$def_boot_osid'");
($clean) = $result->fetchrow_array();
}
if ($isvirt || !$imageable) {
# VIRTNODE HACK: Virtual nodes are special. Do not clean or reload.
$mustclean = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment