Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2013-12-18 16:55:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2013-12-09 17:02:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2013-12-18 16:55:59.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Dec 13 11:03:05 UTC 2013 - mfilka@suse.com
+
+- wicked support - initial implementation
+- adapted to API changes in yast2 3.0.9
+- 3.1.12
+
+-------------------------------------------------------------------
Old:
----
yast2-network-3.1.11.tar.bz2
New:
----
yast2-network-3.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.7WATT3/_old 2013-12-18 16:56:00.000000000 +0100
+++ /var/tmp/diff_new_pack.7WATT3/_new 2013-12-18 16:56:00.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.11
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,16 +29,13 @@
BuildRequires: rpm
BuildRequires: update-desktop-files
BuildRequires: yast2-country
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2-testsuite
-# yast2 v2.23.22: NetworkService handles
-# systemd link network.service->NetworkManager.service
-# yast2 v2.24.4: changes in API for Device type detection
-# yast2 v2.24.5: net device type detection based on sysfs
-BuildRequires: yast2 >= 2.24.4
-Requires: yast2 >= 2.24.5
+# yast2 v3.1.11: wicked support
+BuildRequires: yast2 >= 3.1.11
+Requires: yast2 >= 3.1.11
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.80.0
++++++ yast2-network-3.1.11.tar.bz2 -> yast2-network-3.1.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/VERSION new/yast2-network-3.1.12/VERSION
--- old/yast2-network-3.1.11/VERSION 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/data/phone-codes new/yast2-network-3.1.12/data/phone-codes
--- old/yast2-network-3.1.11/data/phone-codes 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/data/phone-codes 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Create international phone codes map
-# Michal Svec
-
-url="http://www.studyabroad.com/telcodes.html"
-
-echo '/**
- * International phone codes map
- * Author: Michal Svec
- * $Id$
- */
-
-{
-
-textdomain "network";
-
-return $['
-
-lynx -dump "$url" |
- grep '^ \+[0-9]\+ \+[[:alpha:] ]\+ *$' |
- sed 's|^ *\([0-9]\+\) *\(.*\) *$| "\2" : "\1",|g'
-
-echo '];
-
-/* EOF */
-}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/package/yast2-network.changes new/yast2-network-3.1.12/package/yast2-network.changes
--- old/yast2-network-3.1.11/package/yast2-network.changes 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/package/yast2-network.changes 2013-12-17 13:48:08.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Dec 13 11:03:05 UTC 2013 - mfilka@suse.com
+
+- wicked support - initial implementation
+- adapted to API changes in yast2 3.0.9
+- 3.1.12
+
+-------------------------------------------------------------------
Mon Dec 9 09:51:17 UTC 2013 - mfilka@suse.com
- fate#308681
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/package/yast2-network.spec new/yast2-network-3.1.12/package/yast2-network.spec
--- old/yast2-network-3.1.11/package/yast2-network.spec 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/package/yast2-network.spec 2013-12-17 13:48:08.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.11
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,16 +29,13 @@
BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files
BuildRequires: yast2-testsuite
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-country
BuildRequires: yast2-installation >= 2.15.27
-# yast2 v2.23.22: NetworkService handles
-# systemd link network.service->NetworkManager.service
-# yast2 v2.24.4: changes in API for Device type detection
-# yast2 v2.24.5: net device type detection based on sysfs
-BuildRequires: yast2 >= 2.24.4
-Requires: yast2 >= 2.24.5
+# yast2 v3.1.11: wicked support
+BuildRequires: yast2 >= 3.1.11
+Requires: yast2 >= 3.1.11
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.80.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/Makefile.am new/yast2-network-3.1.12/src/Makefile.am
--- old/yast2-network-3.1.11/src/Makefile.am 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/Makefile.am 2013-12-17 13:48:08.000000000 +0100
@@ -83,17 +83,11 @@
include/network/lan/cmdline.rb
scrconf_DATA = \
- scrconf/providers.scr \
- scrconf/cfg_slmodemd.scr \
scrconf/cfg_udev_persistent.scr \
scrconf/etc_hosts.scr \
- scrconf/etc_resolv_conf.scr \
- scrconf/cfg_providers.scr \
scrconf/cfg_dhcp.scr \
scrconf/cfg_network.scr \
- scrconf/isdn.scr \
- scrconf/routes.scr \
- scrconf/etc_defaultdomain.scr
+ scrconf/routes.scr
agent_SCRIPTS = \
servers_non_y2/ag_udev_persistent
@@ -114,7 +108,8 @@
ylibdir = "${yast2dir}/lib/network"
ylib_DATA = \
- lib/network/edit_nic_name.rb
+ lib/network/edit_nic_name.rb \
+ lib/network/confirm_virt_proposal.rb
EXTRA_DIST = \
$(module_DATA) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/clients/dns.rb new/yast2-network-3.1.12/src/clients/dns.rb
--- old/yast2-network-3.1.11/src/clients/dns.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/clients/dns.rb 2013-12-17 13:48:08.000000000 +0100
@@ -219,7 +219,7 @@
Builtins.foreach(options) do |option, value|
if Builtins.contains(unmanaged_only_options, option) &&
- NetworkService.IsManaged
+ NetworkService.is_network_manager
CommandLine.Print(
Ops.add(
Ops.add(_("Cannot set "), option),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/clients/general_proposal.rb new/yast2-network-3.1.12/src/clients/general_proposal.rb
--- old/yast2-network-3.1.11/src/clients/general_proposal.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/clients/general_proposal.rb 2013-12-17 13:48:08.000000000 +0100
@@ -75,9 +75,9 @@
@chosen_id = Ops.get_string(@param, "chosen_id", "")
@seq = :next
if @chosen_id == "lan--nm-enable"
- NetworkService.SetManaged(true)
+ NetworkService.use_network_manager
elsif @chosen_id == "lan--nm-disable"
- NetworkService.SetManaged(false)
+ NetworkService.use_netconfig
elsif @chosen_id == "ipv6-enable"
Lan.SetIPv6(true)
elsif @chosen_id == "ipv6-disable"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/include/network/complex.rb new/yast2-network-3.1.12/src/include/network/complex.rb
--- old/yast2-network-3.1.11/src/include/network/complex.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/include/network/complex.rb 2013-12-17 13:48:08.000000000 +0100
@@ -594,7 +594,7 @@
Builtins.size(Ops.get_map(v, "_aliases", {})),
0
) &&
- !NetworkService.IsManaged
+ !NetworkService.is_network_manager
Builtins.foreach(Ops.get_map(v, "_aliases", {})) do |key, desc|
parameters = Builtins.sformat(
_("IP address: %1, subnet mask %2"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/include/network/lan/complex.rb new/yast2-network-3.1.12/src/include/network/lan/complex.rb
--- old/yast2-network-3.1.11/src/include/network/lan/complex.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/include/network/lan/complex.rb 2013-12-17 13:48:08.000000000 +0100
@@ -71,10 +71,22 @@
# radio button label
# the user can control the network with the NetworkManager
# program
- ["managed", _("&User Controlled with NetworkManager")],
+ [
+ "managed",
+ _("&User Controlled with NetworkManager")
+ ],
# radio button label
# ifup is a program name
- ["ifup", _("&Traditional Method with ifup")]
+ [
+ "ifup",
+ _("&Traditional Method with ifup")
+ ],
+ # radio button label
+ # wicked is network configuration backend like netconfig
+ [
+ "wicked",
+ _("Controlled by &wicked")
+ ],
],
"opt" => [],
"help" => Ops.get_string(@help, "managed", ""),
@@ -336,7 +348,23 @@
# Initialize the NetworkManager widget
# @param [String] key id of the widget
def ManagedInit(key)
- value = NetworkService.IsManaged ? "managed" : "ifup"
+ value = "managed" if NetworkService.is_network_manager
+ value = "ifup" if NetworkService.is_netconfig
+ value = "wicked" if NetworkService.is_wicked
+
+ UI.ChangeWidget(
+ Id("managed"),
+ :Enabled,
+ NetworkService.is_backend_available(:network_manager))
+ UI.ChangeWidget(
+ Id("ifup"),
+ :Enabled,
+ NetworkService.is_backend_available(:netconfig))
+ UI.ChangeWidget(
+ Id("wicked"),
+ :Enabled,
+ NetworkService.is_backend_available(:wicked))
+
UI.ChangeWidget(Id(key), :CurrentButton, value)
nil
@@ -346,23 +374,30 @@
# @param [String] key id of the widget
# @param [Hash] event the event being handled
def ManagedStore(key, event)
- event = deep_copy(event)
- value_g = Convert.to_string(UI.QueryWidget(Id(key), :CurrentButton))
- value = value_g == "managed"
- if NetworkService.IsManaged != value
+ new_backend = UI.QueryWidget(Id(key), :CurrentButton)
+
+ case new_backend
+ when "ifup"
+ NetworkService.use_netconfig
+ when "managed"
+ NetworkService.use_network_manager
+ when "wicked"
+ NetworkService.use_wicked
+ end
+
+ if NetworkService.Modified
LanItems.SetModified
- if value && Stage.normal
+
+ if Stage.normal && NetworkService.is_network_manager
Popup.AnyMessage(
_("Applet needed"),
_(
"NetworkManager is controlled by desktop applet\n" +
- "(KDE plasma widget and nm-applet for GNOME).\n" +
- "Be sure it's running and if not, start it manually."
- )
- )
+ "(KDE plasma widget and nm-applet for GNOME).\n" +
+ "Be sure it's running and if not, start it manually."
+ ))
end
end
- NetworkService.SetManaged(value)
nil
end
@@ -589,7 +624,6 @@
)
# #148485: always show the device overview
- ret = :managed if false && ret == :next && NetworkService.IsManaged
ret
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/include/network/lan/virtual.rb new/yast2-network-3.1.12/src/include/network/lan/virtual.rb
--- old/yast2-network-3.1.11/src/include/network/lan/virtual.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/include/network/lan/virtual.rb 2013-12-17 13:48:08.000000000 +0100
@@ -47,7 +47,7 @@
def initAdditional(key)
##165059
- if NetworkService.IsManaged
+ if NetworkService.is_network_manager
UI.ChangeWidget(:f_additional, :Enabled, false)
end
@@ -85,7 +85,7 @@
# @return dialog result
def handleAdditional(key, event)
event = deep_copy(event)
- return nil if NetworkService.IsManaged
+ return nil if NetworkService.is_network_manager
table_items = Convert.convert(
UI.QueryWidget(Id(:table), :Items),
@@ -148,7 +148,7 @@
def storeAdditional(key, event)
event = deep_copy(event)
- if !NetworkService.IsManaged
+ if !NetworkService.is_network_manager
table_items = Convert.convert(
UI.QueryWidget(Id(:table), :Items),
:from => "any",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/include/network/routines.rb new/yast2-network-3.1.12/src/include/network/routines.rb
--- old/yast2-network-3.1.11/src/include/network/routines.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/include/network/routines.rb 2013-12-17 13:48:08.000000000 +0100
@@ -1067,7 +1067,7 @@
def disableItemsIfNM(items, show_popup)
items = deep_copy(items)
disable = true
- if Mode.normal && NetworkService.IsManaged
+ if Mode.normal && NetworkService.is_network_manager
Builtins.foreach(items) { |w| UI.ChangeWidget(Id(w), :Enabled, false) }
if show_popup
Popup.Warning(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/include/network/services/dns.rb new/yast2-network-3.1.12/src/include/network/services/dns.rb
--- old/yast2-network-3.1.11/src/include/network/services/dns.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/include/network/services/dns.rb 2013-12-17 13:48:08.000000000 +0100
@@ -633,7 +633,6 @@
# Used in GUI mode - initializes widgets according hn_settings
# @param [String] key ignored
def initHostnameGlobal(key)
- # NetworkService::IsManaged () not: #169858, #156830
InitHnSettings()
Builtins.foreach(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/include/network/services/routing.rb new/yast2-network-3.1.12/src/include/network/services/routing.rb
--- old/yast2-network-3.1.11/src/include/network/services/routing.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/include/network/services/routing.rb 2013-12-17 13:48:08.000000000 +0100
@@ -324,7 +324,7 @@
# #178538 - disable routing dialog when NetworkManager is used
# but instead of default route (#299448) - NM reads it
- enabled = !NetworkService.IsManaged
+ enabled = !NetworkService.is_network_manager
UI.ChangeWidget(Id(:table), :Enabled, enabled)
UI.ChangeWidget(Id(:forward_v4), :Enabled, enabled)
@@ -348,7 +348,7 @@
def handleRouting(key, event)
event = deep_copy(event)
- enabled = !NetworkService.IsManaged
+ enabled = !NetworkService.is_network_manager
devs = Routing.GetDevices
devs = Builtins.add(devs, "-")
cur = Convert.to_integer(UI.QueryWidget(Id(:table), :CurrentItem))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/lib/network/confirm_virt_proposal.rb new/yast2-network-3.1.12/src/lib/network/confirm_virt_proposal.rb
--- old/yast2-network-3.1.11/src/lib/network/confirm_virt_proposal.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.12/src/lib/network/confirm_virt_proposal.rb 2013-12-17 13:48:08.000000000 +0100
@@ -0,0 +1,94 @@
+# encoding: utf-8
+
+require 'yast'
+
+module Yast
+
+ Yast.import "UI"
+ Yast.import "LanItems"
+ Yast.import "Popup"
+
+ # The class represents a simple dialog which asks user for confirmation of
+ # network.service restart during installation.
+ class ConfirmVirtProposal
+
+ include UIShortcuts
+ include I18n
+
+ def self.run
+ open
+
+ # for autoinstallation popup has timeout 10 seconds (#192181)
+ # timeout for every case (bnc#429562)
+ ret = UI.TimeoutUserInput(10 * 1000)
+
+ close
+
+ ret
+ end
+
+ private
+
+ def self.open
+ UI.OpenDialog(
+ Opt(:decorated),
+ HBox(
+ HSpacing(1),
+ HCenter(
+ HSquash(
+ VBox(
+ HCenter(
+ HSquash(
+ VBox(
+ # This is the heading of the popup box
+ Left(Heading(_("Confirm Network Restart"))),
+ VSpacing(0.5),
+ # This is in information message. Next come the
+ # hardware class name (network cards).
+ HVCenter(
+ Label(
+ _(
+ "Because of the bridged network, YaST2 needs to restart the network to apply the settings."
+ )
+ )
+ ),
+ VSpacing(0.5)
+ )
+ )
+ ),
+ ButtonBox(
+ HWeight(
+ 1,
+ PushButton(
+ Id(:ok),
+ Opt(:default, :okButton),
+ Label.OKButton
+ )
+ ),
+ # PushButton label
+ HWeight(
+ 1,
+ PushButton(
+ Id(:cancel),
+ Opt(:cancelButton),
+ Label.CancelButton
+ )
+ )
+ ),
+ VSpacing(0.2)
+ )
+ )
+ ),
+ HSpacing(1)
+ )
+ )
+
+ UI.SetFocus(Id(:ok))
+ end
+
+ def self.close
+ UI.CloseDialog
+ end
+
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/modules/Lan.rb new/yast2-network-3.1.12/src/modules/Lan.rb
--- old/yast2-network-3.1.11/src/modules/Lan.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/modules/Lan.rb 2013-12-17 13:48:08.000000000 +0100
@@ -30,6 +30,7 @@
# Representation of the configuration of network cards.
# Input and output routines.
require "yast"
+require "network/confirm_virt_proposal"
module Yast
class LanClass < Module
@@ -545,7 +546,7 @@
end
# Progress stage 10
step_labels = Builtins.add(step_labels, _("Update configuration"))
- if !NetworkService.IsManaged &&
+ if !NetworkService.is_network_manager &&
!@write_only #(boolean) SCR::Read(.init.scripts.exists, "smpppd") &&
# Progress stage 11
step_labels = Builtins.add(step_labels, _("Set up smpppd"))
@@ -612,7 +613,6 @@
return false if Abort()
# Progress step 7
ProgressNextStage(_("Setting up network services..."))
- NetworkService.EnableDisable
writeIPv6
Builtins.sleep(sl)
@@ -632,7 +632,7 @@
# Progress step 9
ProgressNextStage(_("Activating network services..."))
# during installation export sysconfig settings into NetworkManager (bnc#433084)
- if Mode.installation && NetworkService.IsManaged
+ if Mode.installation && NetworkService.is_network_manager
Builtins.y2internal(
"Export sysconfig settings into NetworkManager %1",
SCR.Execute(
@@ -642,74 +642,16 @@
)
end
- Builtins.y2internal("virt_net_proposal %1", @virt_net_proposal)
+ Builtins.y2milestone("virt_net_proposal %1", @virt_net_proposal)
if Stage.cont && @virt_net_proposal == true &&
(Linuxrc.usessh || Linuxrc.vnc || Linuxrc.display_ip)
- UI.OpenDialog(
- Opt(:decorated),
- HBox(
- HSpacing(1),
- HCenter(
- HSquash(
- VBox(
- HCenter(
- HSquash(
- VBox(
- # This is the heading of the popup box
- Left(Heading(_("Confirm Network Restart"))),
- VSpacing(0.5),
- # This is in information message. Next come the
- # hardware class name (network cards).
- HVCenter(
- Label(
- _(
- "Because of the bridged network, YaST2 needs to restart the network to apply the settings."
- )
- )
- ),
- VSpacing(0.5)
- )
- )
- ),
- ButtonBox(
- HWeight(
- 1,
- PushButton(
- Id(:ok),
- Opt(:default, :okButton),
- Label.OKButton
- )
- ),
- # PushButton label
- HWeight(
- 1,
- PushButton(
- Id(:cancel),
- Opt(:cancelButton),
- Label.CancelButton
- )
- )
- ),
- VSpacing(0.2)
- )
- )
- ),
- HSpacing(1)
- )
- )
-
- UI.SetFocus(Id(:ok))
- # for autoinstallation popup has timeout 10 seconds (#192181)
- # timeout for every case (bnc#429562)
- ret = UI.TimeoutUserInput(10 * 1000)
- if ret == :ok
- Builtins.y2internal(
+ if ConfirmVirtProposal.run == :ok
+ Builtins.y2milestone(
"Restarting network because of bridged proposal"
)
NetworkService.Restart
end
- UI.CloseDialog
# For ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482)
elsif Stage.cont &&
(Linuxrc.usessh || Linuxrc.vnc || Linuxrc.display_ip)
@@ -730,8 +672,7 @@
RunSuSEconfig() if !@write_only
Builtins.sleep(sl)
- if !NetworkService.IsManaged && #&& (boolean) SCR::Read(.init.scripts.exists, "smpppd")
- !@write_only
+ if !NetworkService.is_network_manager && !@write_only
return false if Abort()
# Progress step 11
ProgressNextStage(_("Setting up smpppd(8)..."))
@@ -740,7 +681,7 @@
Builtins.sleep(sl)
end
- if NetworkService.IsManaged
+ if NetworkService.is_network_manager
network = false
timeout = 15
while Ops.greater_than(timeout, 0)
@@ -807,7 +748,12 @@
NetworkConfig.Import(Ops.get_map(settings, "config", {}))
DNS.Import(Builtins.eval(Ops.get_map(settings, "dns", {})))
Routing.Import(Builtins.eval(Ops.get_map(settings, "routing", {})))
- NetworkService.SetManaged(Ops.get_boolean(settings, "managed", false))
+
+ if Ops.get_boolean(settings, "managed", false)
+ NetworkService.use_network_manager
+ else
+ NetworkService.use_netconfig
+ end
if Builtins.haskey(settings, "ipv6")
@ipv6 = Ops.get_boolean(settings, "ipv6", true)
end
@@ -834,7 +780,7 @@
"devices" => devices,
"ipv6" => @ipv6,
"routing" => Routing.Export,
- "managed" => NetworkService.IsManaged,
+ "managed" => NetworkService.is_network_manager,
"start_immediately" => Ops.get_boolean(
LanItems.autoinstall_settings,
"start_immediately",
@@ -890,7 +836,7 @@
link_virt_net = nil
header_nm = _("Network Mode")
- if NetworkService.IsManaged
+ if NetworkService.is_network_manager
href_nm = "lan--nm-disable"
# network mode: the interfaces are controlled by the user
status_nm = _("Interfaces controlled by NetworkManager")
@@ -1238,11 +1184,16 @@
ProposeVirtualized()
else
if !LanItems.nm_proposal_valid
- NetworkService.SetManaged(UseNetworkManager())
+ if UseNetworkManager()
+ NetworkService.use_network_manager
+ else
+ NetworkService.use_netconfig
+ end
+
LanItems.nm_proposal_valid = true
end
- if NetworkService.IsManaged
+ if NetworkService.is_network_manager
ProposeNMInterfaces()
LanItems.modified = true # #144139 workaround
@@ -1532,7 +1483,7 @@
end
end
- if NetworkService.IsManaged
+ if NetworkService.is_network_manager
if !PackageSystem.Installed("NetworkManager")
pkgs = Builtins.add(pkgs, "NetworkManager")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/modules/LanItems.rb new/yast2-network-3.1.12/src/modules/LanItems.rb
--- old/yast2-network-3.1.11/src/modules/LanItems.rb 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/modules/LanItems.rb 2013-12-17 13:48:08.000000000 +0100
@@ -1265,7 +1265,7 @@
),
0
) &&
- !NetworkService.IsManaged
+ !NetworkService.is_network_manager
Builtins.foreach(
Ops.get_map(NetworkInterfaces.Current, "_aliases", {})
) do |key2, desc|
@@ -1848,7 +1848,7 @@
Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "")
) ? "hotplug" : "auto"
end
- if product_startmode == "ifplugd" && NetworkService.IsManaged
+ if product_startmode == "ifplugd" && NetworkService.is_network_manager
Builtins.y2milestone("For NetworkManager will not prefer ifplugd")
product_startmode = IsNotEmpty(
Ops.get_string(@Items, [@current, "hwinfo", "hotplug"], "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/scrconf/cfg_providers.scr new/yast2-network-3.1.12/src/scrconf/cfg_providers.scr
--- old/yast2-network-3.1.11/src/scrconf/cfg_providers.scr 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/scrconf/cfg_providers.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-/**
- * File: cfg_providers.scr
- * Summary: Agent for reading/writing /etc/sysconfig/network/providers/*
- * Author: Michal Svec
- * Access: read / write
- *
- * General syntax:
- * # comment
- * [provider_name]
- * key=value
- *
- * $Id$
- *
- * <p>Reads dialup providers from files
- * /etc/sysconfig/network/providers/*.</p>
- */
-.sysconfig.network.providers
-
-`ag_ini(
- `IniAgent( [ "/etc/sysconfig/network/providers/*" ],
- $[
- /* toplevel values */
- "options" : [ "global_values", "comments_last" ],
- /* empty lines and whole-line comments */
- "comments": [ "^[ \t]*#.*", "^[ \t]*$" ],
- /* matching rules */
- "params" : [
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)='(.*)'[ \t]*", "%s='%s'"], ],
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=\"([^\"`\\$]*)\"[ \t]*", "%s='%s'"], ],
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=([^ \t\"$`'\\#]*)", "%s='%s'"], ],
- // $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=\"([^\"]*)\"", "%s='%s'"], ],
- // $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=([^\"]*[^ \t\"]|)[ \t]*$", "%s='%s'"], ],
- ],
- /* rewrite rules */
- "rewrite" : [
- [ "/etc/sysconfig/network/providers/(.*)$", "/etc/sysconfig/network/providers/%s" ],
- ],
- ]
- )
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/scrconf/cfg_slmodemd.scr new/yast2-network-3.1.12/src/scrconf/cfg_slmodemd.scr
--- old/yast2-network-3.1.11/src/scrconf/cfg_slmodemd.scr 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/scrconf/cfg_slmodemd.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-/**
- * File: cfg_slmodemd.scr
- * Summary: Agent for reading/writing /etc/sysconfig/slmodemd
- * Author: Michal Svec
- * Access: read / write
- *
- * Example:
- * Dir(.sysconfig.slmodemd)
- * (["HTTP_PROXY"])
- **
- * Read(.sysconfig.slmodemd.HTTP_PROXY)
- * ("yes")
- **
- * Write(.sysconfig.slmodemd.HTTP_PROXY, "ppp")
- * (true)
- *
- * $Id$
- *
- * Read/Sets the values defined in <tt>/etc/sysconfig/slmodemd</tt>
- * in an easy manner.
- */
-.sysconfig.slmodemd
-
-`ag_ini(
- `SysConfigFile("/etc/sysconfig/slmodemd")
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/scrconf/etc_defaultdomain.scr new/yast2-network-3.1.12/src/scrconf/etc_defaultdomain.scr
--- old/yast2-network-3.1.11/src/scrconf/etc_defaultdomain.scr 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/scrconf/etc_defaultdomain.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-/**
- * File: etc_defaultdomain.scr
- * Summary: Agent for reading/writing /etc/defaultdomain
- * Author: Martin Vidner
- * Access: read / write
- *
- * Example:
- * Read(.etc.defaultdomain)
- * ("suse.cz")
- *
- * $Id$
- *
- * Returns the domain name for NIS (and some other services)
- */
-.etc.defaultdomain
-
-`ag_anyagent(
- `Description(
- (`File("/etc/defaultdomain")), // real file name
- "", // comment
- false, // read-only?
- (`Or(`String("^\n"), "")) // just a string, may be empty
- )
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/scrconf/etc_resolv_conf.scr new/yast2-network-3.1.12/src/scrconf/etc_resolv_conf.scr
--- old/yast2-network-3.1.11/src/scrconf/etc_resolv_conf.scr 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/scrconf/etc_resolv_conf.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-/**
- * File: etc_resolv_conf.scr
- * Summary: Agent for reading/writing /etc/resolv.conf
- * Author: Michal Svec
- * Access: read / write
- *
- * See:
- * resolv.conf(5)
- * source/core/agent-resolver/doc/resolveragent.txt
- * http://w3.suse.de/~poeml/resolv.conf-modification-howto.txt
- *
- * Example:
- * Read(.etc.resolv_conf.domain)
- * ("suse.de")
- **
- * Read(.etc.resolv_conf.nameserver)
- * (["10.10.0.1", "10.10.10.1", "10.10.11.1"])
- **
- * Write(.etc.resolv_conf.domain, "suse.de")
- * (true)
- *
- * $Id$
- *
- * <p>The target agent is the SCR interface to /etc/resolv.conf,
- * the resolver (name server) configuration file.</p>
- *
- * <p>Using "search, "nameserver", "domain", "sortlist" and "options"
- * as subpaths, the respective values can be read/written.</p>
- *
- * <p>Info paths can be read/written using "modified", "backup", "process",
- * "process_id", "script" and "info" as subpaths of .etc.resolv_conf.</p>
- *
- * <p>For more information see the agent's own documentation.</p>
- */
-.etc.resolv_conf
-
-`ag_resolver(
- `ResolverAgent("/etc/resolv.conf")
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/scrconf/isdn.scr new/yast2-network-3.1.12/src/scrconf/isdn.scr
--- old/yast2-network-3.1.11/src/scrconf/isdn.scr 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/scrconf/isdn.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-.isdn
-
-`ag_ini(
- `IniAgent( [ "/etc/sysconfig/isdn/*" ],
- $[
- /* values at the top level, allow comments after value */
- "options" : [ "global_values", "comments_last" ],
- /* empty lines, comments after value and whole-line comments */
- "comments" : [ "^[ \t]*$", "[ \t]*#.*$", "^[ \t]*#.*$" ],
- /* matching rules */
- "params" : [
- /* VAR1="val1 'bal x" */
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=\"([^\"`\\$]*)\"", "%s=\"%s\"" ] ],
- /* VAR1='val1 xxx" xx' */
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)='([^']*)'", "%s='%s'" ] ],
- /* VAR1=val1 */
- $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=([^ \t\"$`'\\#]*)", "%s=%s" ] ]
- ]
- ]
-))
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.11/src/scrconf/providers.scr new/yast2-network-3.1.12/src/scrconf/providers.scr
--- old/yast2-network-3.1.11/src/scrconf/providers.scr 2013-12-09 14:43:12.000000000 +0100
+++ new/yast2-network-3.1.12/src/scrconf/providers.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-/**
- * File: providers.scr
- * Summary: Agent for predefined (system) providers
- * Authors: Petr Blahos , Michal Svec
- * Access: read-only
- * See: providers.rpm
- *
- * General syntax:
- * # comment
- * [provider_name]
- * key=value
- *
- * $Id$
- *
- * <p>Reads providers from files /usr/share/providers/*.conf.</p>
- */
-.providers
-
-`ag_ini(
- `IniAgent( [ "/usr/share/providers/*.conf", ],
- $[
- /* read-only */
- "options" : [ "read_only" ],
- /* empty lines and whole-line comments */
- "comments" : [ "^[ \t]*$", "^[ \t]*#.*" ],
- /* matching rules for sections */
- "sections" : [
- $[
- "begin" : [ "[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ],
- ],
- ],
- /* matching rules for values */
- "params" : [
- $[
- "match" : [ "^[ \t]*([^=]*[^ \t=])[ \t]*=[ \t]*\"([^\"]*)\"[ \t]*$" , "%s=\"%s\""],
- ],
- ],
- /* rewrite rules */
- "rewrite" : [
- [ "/usr/share/providers/(.*)\.conf$", "/usr/share/providers/%s.conf", ],
- ],
- ]
- )
-)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org