Hello community, here is the log from the commit of package yast2-cluster for openSUSE:Factory checked in at 2015-08-03 17:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-cluster.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-cluster" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-cluster/yast2-cluster.changes 2015-07-21 13:29:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-cluster.new/yast2-cluster.changes 2015-08-03 17:22:19.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 31 08:49:27 UTC 2015 - [email protected] + +- BSC#939497. Using systemd csync2.socket instead of xinetd. +- Version 3.1.20 + +------------------------------------------------------------------- +Wed Jul 29 02:11:00 UTC 2015 - [email protected] + +- BSC#939429. Fix for crash when fail to get empty mask of + tun device. +- Version 3.1.19 + +------------------------------------------------------------------- Old: ---- yast2-cluster-3.1.18.tar.bz2 New: ---- yast2-cluster-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cluster.spec ++++++ --- /var/tmp/diff_new_pack.nYvyvM/_old 2015-08-03 17:22:20.000000000 +0200 +++ /var/tmp/diff_new_pack.nYvyvM/_new 2015-08-03 17:22:20.000000000 +0200 @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -Version: 3.1.18 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-cluster-3.1.18.tar.bz2 -> yast2-cluster-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.18/package/yast2-cluster.changes new/yast2-cluster-3.1.20/package/yast2-cluster.changes --- old/yast2-cluster-3.1.18/package/yast2-cluster.changes 2015-07-20 08:56:38.000000000 +0200 +++ new/yast2-cluster-3.1.20/package/yast2-cluster.changes 2015-07-31 10:51:35.000000000 +0200 @@ -1,7 +1,20 @@ ------------------------------------------------------------------- +Fri Jul 31 08:49:27 UTC 2015 - [email protected] + +- BSC#939497. Using systemd csync2.socket instead of xinetd. +- Version 3.1.20 + +------------------------------------------------------------------- +Wed Jul 29 02:11:00 UTC 2015 - [email protected] + +- BSC#939429. Fix for crash when fail to get empty mask of + tun device. +- Version 3.1.19 + +------------------------------------------------------------------- Mon Jul 20 06:51:20 UTC 2015 - [email protected] -- BSC#938325. Modify the not clear help and warning. +- BSC#938325. Modify the not clear help and warning. - Version 3.1.18 ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.18/package/yast2-cluster.spec new/yast2-cluster-3.1.20/package/yast2-cluster.spec --- old/yast2-cluster-3.1.18/package/yast2-cluster.spec 2015-07-20 08:56:38.000000000 +0200 +++ new/yast2-cluster-3.1.20/package/yast2-cluster.spec 2015-07-31 10:51:35.000000000 +0200 @@ -18,7 +18,7 @@ Name: yast2-cluster %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -Version: 3.1.18 +Version: 3.1.20 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-3.1.18/src/include/cluster/dialogs.rb new/yast2-cluster-3.1.20/src/include/cluster/dialogs.rb --- old/yast2-cluster-3.1.18/src/include/cluster/dialogs.rb 2015-07-20 08:56:38.000000000 +0200 +++ new/yast2-cluster-3.1.20/src/include/cluster/dialogs.rb 2015-07-31 10:51:35.000000000 +0200 @@ -38,6 +38,7 @@ Yast.import "IP" Yast.import "Popup" Yast.import "Service" + Yast.import "SystemdSocket" Yast.import "Report" Yast.import "CWMFirewallInterfaces" Yast.import "SuSEFirewall" @@ -64,6 +65,7 @@ ] @csync2_port = "30865" + @csync2_package = "csync2" # This is the list of usable interface for conntrackd @usable_interface = [] @@ -375,7 +377,7 @@ IP.ToString( Ops.bitwise_and( IP.ToInteger(ip), - Ops.shift_left(4294967295, Ops.subtract(32, Builtins.tointeger(mask))) + Ops.shift_left(4294967295, Ops.subtract(32, mask.to_i)) ) ) end @@ -1025,25 +1027,16 @@ # return 2 if csync2 is OFF or csync2 is blocked by firewall # return 3 if csync2 is ON def csync2_status - ret = nil + csync2_socket = nil + csync2_socket = SystemdSocket.find(@csync2_package) - ret = Convert.to_map( - SCR.Execute(path(".target.bash_output"), "/sbin/chkconfig csync2") - ) - Builtins.y2milestone("chkconfig csync2 = %1", ret) - if Builtins.issubstring( - Ops.get_string(ret, "stderr", ""), - "command not found" - ) == true - return 1 - end - if Builtins.issubstring( - Ops.get_string(ret, "stderr", ""), - "unknown service" - ) == true + if !csync2_socket + y2error("csync2.socket not found.") return 1 end - if Builtins.issubstring(Ops.get_string(ret, "stdout", ""), "off") == true + + if !csync2_socket.enabled? + y2debug("csync2.socket is disabled.") return 2 end #check the firewall whether csync2 port was blocked. @@ -1056,14 +1049,19 @@ 3 end - def try_restart_xinetd - r = Service.RunInitScript("xinetd", "restart") - Builtins.y2debug("try_restart_xinetd return %1", r) - r - end - def csync2_turn_off - SCR.Execute(path(".target.bash_output"), "/sbin/chkconfig csync2 off") + csync2_socket = nil + csync2_socket = SystemdSocket.find(@csync2_package) + + if !csync2_socket + y2error("csync2.socket is missing.") + return nil + end + + csync2_socket.stop + csync2_socket.disable + y2debug("Stop and disable csync2.socket.") + tcp_ports = [] tcp_ports = SuSEFirewallServices.GetNeededTCPPorts("service:cluster") pos = nil @@ -1076,13 +1074,21 @@ { "tcp_ports" => tcp_ports } ) - try_restart_xinetd - nil end def csync2_turn_on - SCR.Execute(path(".target.bash_output"), "/sbin/chkconfig csync2 on") + csync2_socket = nil + csync2_socket = SystemdSocket.find(@csync2_package) + + if !csync2_socket + y2error("csync2.socket is missing.") + return nil + end + + csync2_socket.start + csync2_socket.enable + y2debug("Start and enable csync2.socket.") tcp_ports = [] tcp_ports = SuSEFirewallServices.GetNeededTCPPorts("service:cluster") @@ -1094,9 +1100,6 @@ { "tcp_ports" => tcp_ports } ) - SCR.Execute(path(".target.bash_output"), "/sbin/chkconfig xinetd on") - try_restart_xinetd - nil end
