selecthost: move up the querying of host flags, so they can influence the Ether etc.

diff --git a/Osstest.pm b/Osstest.pm
index c954ed3e3de56a38db1fb7a6dba0c8155aa19f19..71b4bba1b981391ea7d701e6ac0bb8c77402b83a 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -1714,6 +1714,16 @@ END
     $ho->{DhcpLeases}= get_host_property($ho,'dhcp-leases',$c{Dhcp3Leases});
     $ho->{Fqdn}= get_host_property($ho,'fqdn',"$name.$c{TestHostDomain}");
 
+    $ho->{Flags}= { };
+    my $flagsq= $dbh_tests->prepare(<<END);
+        SELECT hostflag FROM hostflags WHERE hostname=?
+END
+    $flagsq->execute($name);
+    while (my ($flag) = $flagsq->fetchrow_array()) {
+        $ho->{Flags}{$flag}= 1;
+    }
+    $flagsq->finish();
+
     if (!$ho->{Ether} || !$ho->{Power}) {
         my $dbh_config= opendb('configdb');
         my $selname= $ho->{Fqdn};
@@ -1744,16 +1754,6 @@ END
     $ho->{Ip}= inet_ntoa($ip_packed);
     die "$ho->{Fqdn} ?" unless defined $ho->{Ip};
 
-    $ho->{Flags}= { };
-    my $flagsq= $dbh_tests->prepare(<<END);
-        SELECT hostflag FROM hostflags WHERE hostname=?
-END
-    $flagsq->execute($name);
-    while (my ($flag) = $flagsq->fetchrow_array()) {
-        $ho->{Flags}{$flag}= 1;
-    }
-    $flagsq->finish();
-
     $ho->{Shared}= resource_check_allocated('host', $name);
     $ho->{SharedReady}=
         $ho->{Shared} &&