From: psc Date: Thu, 21 Jun 2012 14:10:25 +0000 (+0000) Subject: Merge branch '2.6-lhm' of git.credativ.com:muenchen/gosa into 2.6-lhm X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3fc508eb80035aea85b46a3b01b77521d7983976;p=gosa.git Merge branch '2.6-lhm' of git.credativ.com:muenchen/gosa into 2.6-lhm git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@21170 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/trunk/gosa-si/server/events/gosaTriggered.pm b/trunk/gosa-si/server/events/gosaTriggered.pm index d7ef85131..bcd8c4973 100644 --- a/trunk/gosa-si/server/events/gosaTriggered.pm +++ b/trunk/gosa-si/server/events/gosaTriggered.pm @@ -645,6 +645,7 @@ sub trigger_action_reinstall { $msg =~ s/
gosa_trigger_action_reinstall<\/header>/
trigger_action_reinstall<\/header>/; &main::change_fai_state('reinstall', \@{$msg_hash->{macaddress}}, $session_id); + &main::change_goto_state('active', \@{$msg_hash->{macaddress}}, $session_id); my %data = ( 'macaddress' => \@{$msg_hash->{macaddress}} ); my $wake_msg = &build_msg("trigger_wake", "GOSA", "KNOWN_SERVER", \%data);