Attachment 4207 Details for Bug 157 – drakx-net patch

[patch] drakx-net patch

drakx-net.patch (text/plain), 1.15 KB, created by Derek Jennings on 2013-07-14 09:45:26 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Jennings

Created: 2013-07-14 09:45:26 CEST

Size: 1.15 KB

patch

obsolete

>--- lib/network/connection_manager.pm	2013-07-14 08:15:39.000000000 +0100
>+++ /usr/lib/libDrakX/network/connection_manager.pm	2013-07-14 08:23:14.450668880 +0100
>@@ -222,6 +222,7 @@
> sub monitor_connection {
>     my ($cmanager) = @_;
>     my $interface  = $cmanager->{connection} && $cmanager->{connection}->get_interface or return;
>+    $cmanager->{in}->do_pkgs->install('net_monitor');
>     run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $interface);
> }
> 
>--- bin/net_applet	2013-07-14 08:15:40.000000000 +0100
>+++ /usr/bin/net_applet	2013-07-14 08:31:30.575627161 +0100
>@@ -15,6 +15,7 @@
> use network::connection::ethernet;
> use network::vpn;
> use run_program;
>+use do_pkgs;
> use mygtk2 qw(gtknew gtkset);
> use dbus_object;
> use network::monitor;
>@@ -315,6 +316,10 @@
>     return getAutoStart();
> }
> sub run_net_monitor() {
>+    my $in = 'do_pkgs';
>+    # stop reaping child processes or else gurpmi segfaults
>+    local $SIG{CHLD} = "DEFAULT";
>+    $in->do_pkgs->install('net_monitor');
>     run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $current_interface) unless is_running('net_monitor');
> }
> sub run_netcenter() {
>

--- lib/network/connection_manager.pm	2013-07-14 08:15:39.000000000 +0100
+++ /usr/lib/libDrakX/network/connection_manager.pm	2013-07-14 08:23:14.450668880 +0100
@@ -222,6 +222,7 @@
 sub monitor_connection {
     my ($cmanager) = @_;
     my $interface  = $cmanager->{connection} && $cmanager->{connection}->get_interface or return;
+    $cmanager->{in}->do_pkgs->install('net_monitor');
     run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $interface);
 }
 
--- bin/net_applet	2013-07-14 08:15:40.000000000 +0100
+++ /usr/bin/net_applet	2013-07-14 08:31:30.575627161 +0100
@@ -15,6 +15,7 @@
 use network::connection::ethernet;
 use network::vpn;
 use run_program;
+use do_pkgs;
 use mygtk2 qw(gtknew gtkset);
 use dbus_object;
 use network::monitor;
@@ -315,6 +316,10 @@
     return getAutoStart();
 }
 sub run_net_monitor() {
+    my $in = 'do_pkgs';
+    # stop reaping child processes or else gurpmi segfaults
+    local $SIG{CHLD} = "DEFAULT";
+    $in->do_pkgs->install('net_monitor');
     run_program::raw({ detach => 1 }, '/usr/bin/net_monitor', '--defaultintf', $current_interface) unless is_running('net_monitor');
 }
 sub run_netcenter() {

Actions: View | Diff

Attachments on bug 157: 4206 | 4207