Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12 ## BNC# 864619 : "Wicked is enabled on SLED 12" (REOPENED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-06-06 16:26:23.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-06-09 14:38:38.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jun 9 11:53:58 UTC 2014 - mfilka@suse.com + +- bnc#864619 + - stop wicked service(s) properly when switching network services +- 3.1.76 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 73 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:39135 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.75.tar.bz2 New: ---- yast2-3.1.76.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.p1x0cy/_old 2014-06-10 10:01:49.000000000 +0200 +++ /var/tmp/diff_new_pack.p1x0cy/_new 2014-06-10 10:01:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.75 +Version: 3.1.76 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.75.tar.bz2 -> yast2-3.1.76.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.75/library/network/src/modules/NetworkService.rb new/yast2-3.1.76/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.75/library/network/src/modules/NetworkService.rb 2014-06-04 13:05:21.000000000 +0200 +++ new/yast2-3.1.76/library/network/src/modules/NetworkService.rb 2014-06-09 14:31:33.000000000 +0200 @@ -76,7 +76,7 @@ include Yast::Logger def main - Yast.import "Service" + Yast.import "SystemdService" Yast.import "NetworkConfig" Yast.import "Popup" Yast.import "Mode" @@ -175,31 +175,19 @@ # Initialize module data def Read - if !@initialized - case Service.GetServiceId("network") - when "network" - @current_name = :netconfig - when "NetworkManager" - @current_name = :network_manager - when "wicked" - @current_name = :wicked - else - if Stage.initial - @current_name = DEFAULT_BACKEND - log.info "Running in installer, use default: #{@current_name}" - elsif Mode.config - @current_name = DEFAULT_BACKEND - log.info "Running in AutoYast config, use default: #{@current_name}" - else - log.info "Cannot determine used network service." - raise "Cannot detect used network service" - end - end - - @cached_name = @current_name + return if @initialized - log.info "Current backend: #{@current_name}" + if Stage.initial + @current_name = DEFAULT_BACKEND + log.info "Running in installer/AutoYaST, use default: #{@current_name}" + else + name = SystemdService.find!("network").name + @current_name = BACKENDS.invert[name] end + + @cached_name = @current_name + + log.info "Current backend: #{@current_name}" @initialized = true nil @@ -219,30 +207,25 @@ # Helper to apply a change of the network service def EnableDisableNow - if Modified() - # Stop should be called before, but when the service - # were not correctly started until now, stop may have - # no effect. - # So let's kill all processes in the network service - # cgroup to make sure e.g. dhcp clients are stopped. - @initialized = false - RunSystemCtl( BACKENDS[ @current_name], "kill") + return if !Modified() - case @cached_name - when :network_manager, :wicked - RunSystemCtl( BACKENDS[ @cached_name], "--force enable") - when :netconfig - RunSystemCtl( BACKENDS[ @current_name], "disable") - - # Workaround for bug #61055: - Builtins.y2milestone("Enabling service %1", "network") - cmd = "cd /; /sbin/insserv -d /etc/init.d/network" - SCR.Execute(path(".target.bash"), cmd) - end + stop_service(@current_name) - Read() + case @cached_name + when :network_manager, :wicked + RunSystemCtl( BACKENDS[ @cached_name], "--force enable") + when :netconfig + RunSystemCtl( BACKENDS[ @current_name], "disable") + + # Workaround for bug #61055: + Builtins.y2milestone("Enabling service %1", "network") + cmd = "cd /; /sbin/insserv -d /etc/init.d/network" + SCR.Execute(path(".target.bash"), cmd) end + @initialized = false + Read() + nil end @@ -436,6 +419,25 @@ nil end + # Stops backend network service + def stop_service(service) + if service == :wicked + # FIXME: + # you really need to use 'wickedd'. Moreover kill action do not + # kill all wickedd services - e.g. nanny, dhcp* ... stays running + # This needs to be clarified with wicked people. + # bnc#864619 + RunSystemCtl("wickedd", "stop") + else + # Stop should be called before, but when the service + # were not correctly started until now, stop may have + # no effect. + # So let's kill all processes in the network service + # cgroup to make sure e.g. dhcp clients are stopped. + RunSystemCtl(BACKENDS[ @current_name], "kill") + end + end + publish :function => :Read, :type => "void ()" publish :function => :Modified, :type => "boolean ()" publish :function => :is_backend_available, :type => "boolean (symbol)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.75/package/yast2.changes new/yast2-3.1.76/package/yast2.changes --- old/yast2-3.1.75/package/yast2.changes 2014-06-04 13:05:29.000000000 +0200 +++ new/yast2-3.1.76/package/yast2.changes 2014-06-09 14:31:34.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 9 11:53:58 UTC 2014 - mfilka@suse.com + +- bnc#864619 + - stop wicked service(s) properly when switching network services +- 3.1.76 + +------------------------------------------------------------------- Wed Jun 4 12:47:17 CEST 2014 - locilka@suse.com - Adjusted textdomain for OSRelease library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.75/package/yast2.spec new/yast2-3.1.76/package/yast2.spec --- old/yast2-3.1.75/package/yast2.spec 2014-06-04 13:05:29.000000000 +0200 +++ new/yast2-3.1.76/package/yast2.spec 2014-06-09 14:31:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.75 +Version: 3.1.76 Release: 0 URL: https://github.com/yast/yast-yast2 continue with "q"... Checked in at Tue Jun 10 10:02:35 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org