From 95deb0278b67058e6dff664ec1c3ecd378b69e2d Mon Sep 17 00:00:00 2001 From: psc Date: Tue, 18 Jun 2013 11:17:52 +0000 Subject: [PATCH] Fix LHM #8687 Add returned message from set_activated_for_installation method to list of messages to return from trigger_action_reinstall callback. Implicitly activate clients when installing. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@21235 594d385d-05f5-0310-b6e9-bd551577e9d8 --- trunk/gosa-si/server/events/gosaTriggered.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/trunk/gosa-si/server/events/gosaTriggered.pm b/trunk/gosa-si/server/events/gosaTriggered.pm index bcd8c4973..f72d5798b 100644 --- a/trunk/gosa-si/server/events/gosaTriggered.pm +++ b/trunk/gosa-si/server/events/gosaTriggered.pm @@ -646,13 +646,15 @@ sub trigger_action_reinstall { &main::change_fai_state('reinstall', \@{$msg_hash->{macaddress}}, $session_id); &main::change_goto_state('active', \@{$msg_hash->{macaddress}}, $session_id); + my @out_msg_l = &set_activated_for_installation($msg, $msg_hash, $session_id); my %data = ( 'macaddress' => \@{$msg_hash->{macaddress}} ); my $wake_msg = &build_msg("trigger_wake", "GOSA", "KNOWN_SERVER", \%data); # invoke trigger wake for this gosa-si-server &main::server_server_com::trigger_wake($msg, $msg_hash, $session_id); - my @out_msg_l = ($wake_msg, $msg); + push(@out_msg_l, $wake_msg); + push(@out_msg_l, $msg); return @out_msg_l; } -- 2.30.2