Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2016-08-31 00:01:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2016-08-25 09:53:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes
2016-08-31 00:01:52.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 24 10:54:55 UTC 2016 - mfi...@suse.com
+
+- bnc#993587
+ - installer is able to newly configured set devices up in case of
+ ssh/vnc installation
+- 3.1.168
+
+-------------------------------------------------------------------
Old:
----
yast2-network-3.1.167.tar.bz2
New:
----
yast2-network-3.1.168.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.bozskv/_old 2016-08-31 00:01:53.000000000 +0200
+++ /var/tmp/diff_new_pack.bozskv/_new 2016-08-31 00:01:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.167
+Version: 3.1.168
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.1.167.tar.bz2 -> yast2-network-3.1.168.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.167/package/yast2-network.changes
new/yast2-network-3.1.168/package/yast2-network.changes
--- old/yast2-network-3.1.167/package/yast2-network.changes 2016-08-23
09:35:26.000000000 +0200
+++ new/yast2-network-3.1.168/package/yast2-network.changes 2016-08-25
16:43:51.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Aug 24 10:54:55 UTC 2016 - mfi...@suse.com
+
+- bnc#993587
+ - installer is able to newly configured set devices up in case of
+ ssh/vnc installation
+- 3.1.168
+
+-------------------------------------------------------------------
Fri Aug 19 08:59:14 UTC 2016 - mfi...@suse.com
- bnc#991382
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.167/package/yast2-network.spec
new/yast2-network-3.1.168/package/yast2-network.spec
--- old/yast2-network-3.1.167/package/yast2-network.spec 2016-08-23
09:35:26.000000000 +0200
+++ new/yast2-network-3.1.168/package/yast2-network.spec 2016-08-25
16:43:51.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.167
+Version: 3.1.168
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-3.1.167/src/lib/network/network_autoconfiguration.rb
new/yast2-network-3.1.168/src/lib/network/network_autoconfiguration.rb
--- old/yast2-network-3.1.167/src/lib/network/network_autoconfiguration.rb
2016-08-23 09:35:26.000000000 +0200
+++ new/yast2-network-3.1.168/src/lib/network/network_autoconfiguration.rb
2016-08-25 16:43:51.000000000 +0200
@@ -1,14 +1,15 @@
# encoding: utf-8
require "yast"
+require "network/wicked"
module Yast
# The class is responsible for generating / proposing automatic
# configuration during installation workflow
class NetworkAutoconfiguration
+ include Wicked
include Singleton
include Logger
- include Yast
Yast.import "Lan"
Yast.import "LanItems"
@@ -18,8 +19,6 @@
Yast.import "Arch"
Yast.import "Host"
- BASH_PATH = Path.new(".target.bash")
-
def configure_dhcp
Yast.include self, "network/routines.rb"
@@ -142,17 +141,6 @@
LanItems.Commit
end
- # Reloads configuration for each device named in devs
- #
- # @devs [Array] list of device names
- # @return true if configuration was reloaded
- def reload_config(devs)
- raise ArgumentError if devs.nil?
- return true if devs.empty?
-
- SCR.Execute(BASH_PATH, "wicked ifreload #{devs.join(" ")}") == 0
- end
-
def delete_config(devname)
LanItems.delete_dev(devname)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.167/src/lib/network/wicked.rb
new/yast2-network-3.1.168/src/lib/network/wicked.rb
--- old/yast2-network-3.1.167/src/lib/network/wicked.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-network-3.1.168/src/lib/network/wicked.rb 2016-08-25
16:43:51.000000000 +0200
@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+require "yast"
+
+module Yast
+ module Wicked
+ BASH_PATH = Path.new(".target.bash")
+
+ # Reloads configuration for each device named in devs
+ #
+ # @devs [Array] list of device names
+ # @return true if configuration was reloaded
+ def reload_config(devs)
+ raise ArgumentError if devs.nil?
+ return true if devs.empty?
+
+ SCR.Execute(BASH_PATH, "wicked ifreload #{devs.join(" ")}").zero?
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.167/src/modules/Lan.rb
new/yast2-network-3.1.168/src/modules/Lan.rb
--- old/yast2-network-3.1.167/src/modules/Lan.rb 2016-08-23
09:35:26.000000000 +0200
+++ new/yast2-network-3.1.168/src/modules/Lan.rb 2016-08-25
16:43:51.000000000 +0200
@@ -1120,17 +1120,28 @@
private
def activate_network_service
- if LanItems.force_restart
+ # If the second installation stage has been called by yast.ssh via
+ # ssh, we should not restart network because systemctl
+ # hangs in that case. (bnc#885640)
+ action = :reload_restart if Stage.normal || !Linuxrc.usessh
+ action = :force_restart if LanItems.force_restart
+ action = :remote_installer if Stage.initial && (Linuxrc.usessh ||
Linuxrc.vnc)
+
+ case action
+ when :force_restart
log.info("Network service activation forced")
NetworkService.Restart
- else
- log.info "Attempting to reload network service, normal stage " \
- "#{Stage.normal}, ssh: #{Linuxrc.usessh}"
- # If the second installation stage has been called by yast.ssh via
- # ssh, we should not restart network cause systemctl
- # hangs in that case. (bnc#885640)
+ when :reload_restart
+ log.info("Attempting to reload network service, normal stage
#{Stage.normal}, ssh: #{Linuxrc.usessh}")
+
NetworkService.ReloadOrRestart if Stage.normal || !Linuxrc.usessh
+
+ when :remote_installer
+ # last instance handling "special" cases like ssh installation
+ # FIXME: most probably not everything will be set properly
+ log.info("Running in ssh/vnc installer -> just setting links up")
+ LanItems.reload_config(LanItems.GetAllInterfaces())
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.167/src/modules/LanItems.rb
new/yast2-network-3.1.168/src/modules/LanItems.rb
--- old/yast2-network-3.1.167/src/modules/LanItems.rb 2016-08-23
09:35:26.000000000 +0200
+++ new/yast2-network-3.1.168/src/modules/LanItems.rb 2016-08-25
16:43:51.000000000 +0200
@@ -24,6 +24,7 @@
require "yast"
require "yaml"
require "network/install_inf_convertor"
+require "network/wicked"
module Yast
# Does way too many things.
@@ -46,6 +47,7 @@
attr_accessor :ipoib_mode
include Logger
+ include Wicked
def main
Yast.import "UI"
