From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 Mar 2008 14:24:43 +0000 (+0000)
Subject: Enabled softupdates
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a6cf356e15cf76c01db89e7d23fded5dc9b515f;p=gosa.git

Enabled softupdates


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9925 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-si/client/events/gosaTriggered.pm b/gosa-si/client/events/gosaTriggered.pm
index a13b872ce..cf364b4dd 100644
--- a/gosa-si/client/events/gosaTriggered.pm
+++ b/gosa-si/client/events/gosaTriggered.pm
@@ -215,42 +215,22 @@ sub trigger_action_reinstall {
 }
 
 
+# Backward compatibility
 sub trigger_action_update {
     my ($msg, $msg_hash) = @_;
 
-    # execute function
-    open(FILE, "> /etc/gosa-si/event");
-    print FILE "trigger_action_reinstall\n";
-    close(FILE);
-
-    # check logged in user
-    my $logged_in_user = 1;
-    if( $logged_in_user ) {
-        print STDERR "This system has been sent a signal for an update. The update will take place after you log out.\n";
-    }
-    else {
-        # not jet
-        #system( "DEBIAN_FRONTEND=noninteractive /usr/sbin/fai -N softupdate &" )
-    }
+    # Execute update
+    system( "DEBIAN_FRONTEND=noninteractive /usr/sbin/fai-softupdate &" );
 
     return;
 }
 
-
+# Backward compatibility
 sub trigger_action_instant_update {
     my ($msg, $msg_hash) = @_;
 
-    # check logged in user
-    my $logged_in_user = 1;
-    if( $logged_in_user ) {
-        print STDERR "This system has been sent a signal for an update. The update will take place now.\n";
-		if(stat('/usr/bin/fai-softupdate-notify')) {
-			system('/usr/bin/fai-softupdate-notify start');
-		}
-    }
-
-    # not jet
-    #system( "DEBIAN_FRONTEND=noninteractive /usr/sbin/fai -N softupdate &" )
+    # Execute update
+    system( "DEBIAN_FRONTEND=noninteractive /usr/sbin/fai-softupdate &" );
 
     return;
 }