From 97e5323dcf7490241a62a788b3d6df4962224bba Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 8 Apr 2019 15:05:44 +0200 Subject: [PATCH] Disable routing widgets for nm --- src/lib/y2network/widgets/ip4_forwarding.rb | 2 ++ src/lib/y2network/widgets/ip6_forwarding.rb | 2 ++ src/lib/y2network/widgets/routing_buttons.rb | 14 +++++++++++++- src/lib/y2network/widgets/routing_table.rb | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/lib/y2network/widgets/ip4_forwarding.rb b/src/lib/y2network/widgets/ip4_forwarding.rb index f3f61db3c..2bc08ca06 100644 --- a/src/lib/y2network/widgets/ip4_forwarding.rb +++ b/src/lib/y2network/widgets/ip4_forwarding.rb @@ -1,4 +1,5 @@ require "cwm/common_widgets" +Yast.import "NetworkService" module Y2Network module Widgets @@ -11,6 +12,7 @@ def initialize(config) def init self.value = @config.routing.forward_ipv4 + disable if Yast::NetworkService.network_manager? end def store diff --git a/src/lib/y2network/widgets/ip6_forwarding.rb b/src/lib/y2network/widgets/ip6_forwarding.rb index 749a1a157..b76934346 100644 --- a/src/lib/y2network/widgets/ip6_forwarding.rb +++ b/src/lib/y2network/widgets/ip6_forwarding.rb @@ -1,4 +1,5 @@ require "cwm/common_widgets" +Yast.import "NetworkService" module Y2Network module Widgets @@ -11,6 +12,7 @@ def initialize(config) def init self.value = @config.routing.forward_ipv6 + disable if Yast::NetworkService.network_manager? end def store diff --git a/src/lib/y2network/widgets/routing_buttons.rb b/src/lib/y2network/widgets/routing_buttons.rb index 3d67af3d4..3947d9067 100644 --- a/src/lib/y2network/widgets/routing_buttons.rb +++ b/src/lib/y2network/widgets/routing_buttons.rb @@ -2,7 +2,7 @@ require "y2network/dialogs/route" require "y2network/route" -Yast.import "Routing" +Yast.import "NetworkService" module Y2Network module Widgets @@ -24,6 +24,10 @@ def handle nil end + + def init + disable if Yast::NetworkService.network_manager? + end end class EditRoute < CWM::PushButton @@ -46,6 +50,10 @@ def handle nil end + + def init + disable if Yast::NetworkService.network_manager? + end end class DeleteRoute < CWM::PushButton @@ -65,6 +73,10 @@ def handle nil end + + def init + disable if Yast::NetworkService.network_manager? + end end end end diff --git a/src/lib/y2network/widgets/routing_table.rb b/src/lib/y2network/widgets/routing_table.rb index 4de78b45d..aa195e958 100644 --- a/src/lib/y2network/widgets/routing_table.rb +++ b/src/lib/y2network/widgets/routing_table.rb @@ -4,6 +4,7 @@ require "y2network/interface" Yast.import "Label" +Yast.import "NetworkService" module Y2Network module Widgets @@ -40,6 +41,7 @@ def items # TODO: just workaround to make it work with old hash based CWM def init redraw_table + disable if Yast::NetworkService.network_manager? end def selected_route