power: Rename target_reboot_force from target_reboot_hard

We are going to make this try softer methods first.

No functional change.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index e45f54b296e4992ae0e743908ff25a1c51d746df..96ddbc3c23393a66aed1a5f827fb3ec9a87a82f1 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -98,7 +98,7 @@ BEGIN {
                       sshopts authorized_keys known_hosts
                       cfg_tftp_di_version controller_ipaddr
                       remote_perl_script_open remote_perl_script_done
-                      host_reboot target_reboot target_reboot_hard            
+                      host_reboot target_reboot target_reboot_force
                       target_choose_vg target_umount_lv target_await_down
                       host_get_free_memory
 
@@ -1437,7 +1437,7 @@ sub target_reboot ($) {
     await_tcp(get_timeout($ho,'reboot',$timeout{RebootUp}), 5,$ho);
 }
 
-sub target_reboot_hard ($) {
+sub target_reboot_force ($) {
     my ($ho) = @_;
     power_cycle($ho);
     await_tcp(get_timeout($ho,'reboot',$timeout{HardRebootUp}), 5, $ho);

diff --git a/ts-logs-capture b/ts-logs-capture
index ebf40721649c7c38698afd18be8d48817e96f8f9..fe3b0813273871b408ca894a263f1b6073dd21b1 100755 (executable)
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -175,7 +175,7 @@ sub fetch_logs_host () {
     if (!try_fetch_logs($ho, $logs)) {
         logm("log fetching failed, trying hard host reboot...");
         if (!eval {
-            target_reboot_hard($ho);
+            target_reboot_force($ho);
             1;
         }) {
             logm("host reboot failed, abandoning log fetches: $@");