May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-samba-server for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at 2014-05-06 13:40:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes 2014-04-05 14:42:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-samba-server.new/yast2-samba-server.changes 2014-05-06 13:40:59.000000000 +0200 @@ -1,0 +2,12 @@ +Tue May 6 05:34:49 UTC 2014 - mfilka(a)suse.com + +- Adapted testsuite to last changes in Service module. +- 3.1.8 + +------------------------------------------------------------------- +Tue Apr 22 15:49:38 CEST 2014 - locilka(a)suse.com + +- Deprecated Service method calls replaced with new ones +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-samba-server-3.1.6.tar.bz2 New: ---- yast2-samba-server-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.JRSphT/_old 2014-05-06 13:41:00.000000000 +0200 +++ /var/tmp/diff_new_pack.JRSphT/_new 2014-05-06 13:41:00.000000000 +0200 @@ -17,14 +17,14 @@ Name: yast2-samba-server -Version: 3.1.6 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 Url: https://github.com/yast/yast-samba-server -# Service module switched to systemd +# Service.Active BuildRequires: libsmbclient BuildRequires: libsmbclient-devel BuildRequires: perl-Crypt-SmbHash @@ -32,7 +32,7 @@ BuildRequires: perl-XML-Writer BuildRequires: samba-client BuildRequires: update-desktop-files -BuildRequires: yast2 >= 2.23.15 +BuildRequires: yast2 >= 3.1.53 BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-ldap BuildRequires: yast2-perl-bindings @@ -41,8 +41,8 @@ BuildRequires: yast2-users Requires: perl-Crypt-SmbHash -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# Service.Active +Requires: yast2 >= 3.1.53 Requires: yast2-ldap >= 3.1.2 Requires: yast2-network Requires: yast2-perl-bindings ++++++ yast2-samba-server-3.1.6.tar.bz2 -> yast2-samba-server-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/package/yast2-samba-server.changes new/yast2-samba-server-3.1.8/package/yast2-samba-server.changes --- old/yast2-samba-server-3.1.6/package/yast2-samba-server.changes 2014-03-28 15:48:02.000000000 +0100 +++ new/yast2-samba-server-3.1.8/package/yast2-samba-server.changes 2014-05-06 08:38:49.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue May 6 05:34:49 UTC 2014 - mfilka(a)suse.com + +- Adapted testsuite to last changes in Service module. +- 3.1.8 + +------------------------------------------------------------------- +Tue Apr 22 15:49:38 CEST 2014 - locilka(a)suse.com + +- Deprecated Service method calls replaced with new ones +- 3.1.7 + +------------------------------------------------------------------- Fri Mar 28 14:38:00 UTC 2014 - vmoravec(a)suse.com - Fix failing testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/package/yast2-samba-server.spec new/yast2-samba-server-3.1.8/package/yast2-samba-server.spec --- old/yast2-samba-server-3.1.6/package/yast2-samba-server.spec 2014-03-28 15:48:02.000000000 +0100 +++ new/yast2-samba-server-3.1.8/package/yast2-samba-server.spec 2014-05-06 08:38:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 3.1.6 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,14 +26,14 @@ Group: System/YaST License: GPL-2.0 -# Service module switched to systemd -BuildRequires: yast2 >= 2.23.15 +# Service.Active +BuildRequires: yast2 >= 3.1.53 BuildRequires: libsmbclient libsmbclient-devel perl-Crypt-SmbHash perl-X500-DN samba-client yast2-samba-client perl-XML-Writer update-desktop-files yast2-testsuite yast2-perl-bindings yast2-ldap yast2-users BuildRequires: yast2-devtools >= 3.1.10 Requires: perl-Crypt-SmbHash -# Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +# Service.Active +Requires: yast2 >= 3.1.53 Requires: yast2-ldap >= 3.1.2 Requires: yast2-perl-bindings Requires: yast2-network diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/src/modules/SambaService.pm new/yast2-samba-server-3.1.8/src/modules/SambaService.pm --- old/yast2-samba-server-3.1.6/src/modules/SambaService.pm 2014-03-28 15:48:02.000000000 +0100 +++ new/yast2-samba-server-3.1.8/src/modules/SambaService.pm 2014-05-06 08:38:49.000000000 +0200 @@ -51,6 +51,8 @@ # Is smb and nmb service enabled? our $Service = 0; +our @service_names = ("nmb", "smb"); + # Data was modified? BEGIN{ $TYPEINFO{GetModified} = ["function", "boolean"] } sub GetModified { @@ -89,10 +91,20 @@ sub Write { my ($self) = @_; my $error = 0; + return 1 unless $Modified; + y2debug("Samba service if ". ($Service ? "enabled" : "disabled")); - Service->Adjust("nmb", $Service ? "enable" : "disable") or $error = 1; - Service->Adjust("smb", $Service ? "enable" : "disable") or $error = 1; + if ($Service) { + foreach my $service_name (@service_names) { + Service->Enable($service_name) or $error = 1; + } + } else { + foreach my $service_name (@service_names) { + Service->Disable($service_name) or $error = 1; + } + } + $Modified = 0; return $error == 0; } @@ -118,9 +130,8 @@ BEGIN{$TYPEINFO{GetServiceRunning} = ["function", "boolean"]} sub GetServiceRunning { my $running = 1; - foreach("nmb", "smb") { - # '0' means -> running - if (Service->Status($_)) { + foreach(@service_names) { + if (! Service->Active($_)) { $running = 0; } } @@ -133,35 +144,36 @@ sub StartStopNow { my ($self, $on) = @_; my $error = 0; - + # Zero connected users -> restart, einther -> reload my $connected_users = $self->ConnectedUsers(); - my $run_command = (scalar(@$connected_users)>0 ? "reload":"restart"); + my $nr_connected_users = scalar(@$connected_users); - foreach("nmb", "smb") { + foreach my $service_name (@service_names) { if ($on) { # check, if the services run - if (Service->Status($_)) { + if (Service->Active($service_name)) { # the service does not run => start it - unless (Service->Start($_)) { - y2error("Service::Start($_) failed"); + unless (Service->Start($service_name)) { + y2error("Service::Start($service_name) failed"); $error = 1; } } else { # the service runs => relaod it # RunInitScript return exit code, 0 = OK # Bugzilla #120080 - 'reload' instead of 'restart' - y2milestone("Number of connected users: ".scalar(@$connected_users).", running ".$_." -> ".$run_command); - if (Service->RunInitScript($_, $run_command)) { - y2error("Service::RunInitScript(".$_.", '".$run_command."') failed"); + my $run_command = (($nr_connected_users > 0) ? "Reload":"Restart"); + y2milestone("Number of connected users: ".$nr_connected_users.", running ".$service_name." -> ".$run_command); + if (! Service->$run_command($service_name)) { + y2error("Service::RunInitScript(".$service_name.", '".$run_command."') failed"); $error = 1; } } } else { # turn services off - unless (Service->Status($_)) { - unless (Service->Stop($_)) { - y2error("Service::Stop($_) failed"); + unless (Service->Active($service_name)) { + unless (Service->Stop($service_name)) { + y2error("Service::Stop($service_name) failed"); $error = 1; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/testsuite/YaPI/tests/YaPI-EditService.out new/yast2-samba-server-3.1.8/testsuite/YaPI/tests/YaPI-EditService.out --- old/yast2-samba-server-3.1.6/testsuite/YaPI/tests/YaPI-EditService.out 2014-03-28 15:48:02.000000000 +0100 +++ new/yast2-samba-server-3.1.8/testsuite/YaPI/tests/YaPI-EditService.out 2014-05-06 08:38:49.000000000 +0200 @@ -1,12 +1,8 @@ Return Enable disabled service -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead Return true Return Disable disabled service Return true Return Enable enabled service -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead -Log [DEPRECIATION] `Adjust' is deprecated; use `enable` or `disable` instead Return true Return Disable enabled service Return true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-3.1.6/testsuite/YaPI/tests/YaPI-GetServiceStatus.out new/yast2-samba-server-3.1.8/testsuite/YaPI/tests/YaPI-GetServiceStatus.out --- old/yast2-samba-server-3.1.6/testsuite/YaPI/tests/YaPI-GetServiceStatus.out 2014-03-28 15:48:02.000000000 +0100 +++ new/yast2-samba-server-3.1.8/testsuite/YaPI/tests/YaPI-GetServiceStatus.out 2014-05-06 08:38:49.000000000 +0200 @@ -1,6 +1,8 @@ Return Disabled service Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show smb.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled smb.service " $["exit":0, "stderr":"", "stdout":""] Return 0 Return Enabled service Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show smb.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":""] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled smb.service " $["exit":0, "stderr":"", "stdout":""] Return 0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-05-06 13:40:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-04-26 11:45:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-05-06 13:40:57.000000000 +0200 @@ -1,0 +2,22 @@ +Mon May 5 22:31:45 UTC 2014 - mfilka(a)suse.com + +- fixed testsuite - adapted to API changes +- 3.1.53 + +------------------------------------------------------------------- +Mon May 5 08:50:48 UTC 2014 - mfilka(a)suse.com + +- bnc#870896 + - fixed proposed DNS / Hostname configuration to be same as in + SLE-11 +- 3.1.52 + +------------------------------------------------------------------- +Mon Apr 28 11:06:47 UTC 2014 - mfilka(a)suse.com + +- bnc#867451 + - when virtual machine is installed, propose virtual interface + configuration +- 3.1.51 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.50.tar.bz2 New: ---- yast2-network-3.1.53.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.qz1C7S/_old 2014-05-06 13:40:59.000000000 +0200 +++ /var/tmp/diff_new_pack.qz1C7S/_new 2014-05-06 13:40:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.50 +Version: 3.1.53 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.50.tar.bz2 -> yast2-network-3.1.53.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/package/yast2-network.changes new/yast2-network-3.1.53/package/yast2-network.changes --- old/yast2-network-3.1.50/package/yast2-network.changes 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/package/yast2-network.changes 2014-05-06 07:33:51.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Mon May 5 22:31:45 UTC 2014 - mfilka(a)suse.com + +- fixed testsuite - adapted to API changes +- 3.1.53 + +------------------------------------------------------------------- +Mon May 5 08:50:48 UTC 2014 - mfilka(a)suse.com + +- bnc#870896 + - fixed proposed DNS / Hostname configuration to be same as in + SLE-11 +- 3.1.52 + +------------------------------------------------------------------- +Mon Apr 28 11:06:47 UTC 2014 - mfilka(a)suse.com + +- bnc#867451 + - when virtual machine is installed, propose virtual interface + configuration +- 3.1.51 + +------------------------------------------------------------------- Fri Apr 25 07:15:25 UTC 2014 - mfilka(a)suse.com - bnc#872319 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/package/yast2-network.spec new/yast2-network-3.1.53/package/yast2-network.spec --- old/yast2-network-3.1.50/package/yast2-network.spec 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/package/yast2-network.spec 2014-05-06 07:33:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.50 +Version: 3.1.53 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/Makefile.am new/yast2-network-3.1.53/src/Makefile.am --- old/yast2-network-3.1.50/src/Makefile.am 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/Makefile.am 2014-05-06 07:33:51.000000000 +0200 @@ -32,14 +32,12 @@ clients/routing.rb \ clients/lan.rb \ clients/host_auto.rb \ - clients/general_proposal.rb \ clients/inst_ask_net_test.rb \ clients/inst_hostname.rb \ clients/firewall_stage1_proposal.rb \ clients/routing_auto.rb \ clients/remote.rb \ clients/dns.rb \ - clients/lan_proposal.rb \ clients/host.rb \ clients/inst_install_inf.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/clients/general_proposal.rb new/yast2-network-3.1.53/src/clients/general_proposal.rb --- old/yast2-network-3.1.50/src/clients/general_proposal.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/clients/general_proposal.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,126 +0,0 @@ -# encoding: utf-8 - -#*************************************************************************** -# -# Copyright (c) 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -#************************************************************************** -# File: clients/general_proposal.ycp -# Package: Network configuration -# Summary: Network mode + ipv6 proposal -# Authors: Martin Vidner <mvidner(a)suse.cz> -# -# -# This is not a standalone proposal, it depends on lan_proposal. It -# must run after it. -module Yast - class GeneralProposalClient < Client - def main - Yast.import "UI" - - textdomain "network" - - # The main () - Builtins.y2milestone("----------------------------------------") - Builtins.y2milestone("General network settings proposal started") - Builtins.y2milestone("Arguments: %1", WFM.Args) - - Yast.import "Lan" - Yast.import "LanItems" - Yast.import "NetworkService" - - Yast.include self, "network/lan/complex.rb" - - @args = WFM.Args - - @func = Ops.get_string(@args, 0, "") - @param = Ops.get_map(@args, 1, {}) - @ret = {} - - # create a textual proposal - if @func == "MakeProposal" - @proposal = "" - @links = [] - @warning = nil - @warning_level = nil - - @sum = Lan.SummaryGeneral - @proposal = Ops.get_string(@sum, 0, "") - @links = Ops.get_list(@sum, 1, []) - - @ret = { - "preformatted_proposal" => @proposal, - "links" => @links, - "warning_level" => @warning_level, - "warning" => @warning - } - # run the module - elsif @func == "AskUser" - @chosen_id = Ops.get_string(@param, "chosen_id", "") - @seq = :next - if @chosen_id == "lan--nm-enable" - NetworkService.use_network_manager - elsif @chosen_id == "lan--nm-disable" - NetworkService.use_netconfig - elsif @chosen_id == "ipv6-enable" - Lan.SetIPv6(true) - elsif @chosen_id == "ipv6-disable" - Lan.SetIPv6(false) - elsif @chosen_id == "virtual-enable" - Lan.virt_net_proposal = true - elsif @chosen_id == "virtual-revert" - Lan.virt_net_proposal = false - else - Wizard.CreateDialog - Wizard.SetDesktopTitleAndIcon("lan") - - @seq = ManagedDialog() - Wizard.CloseDialog - end - LanItems.proposal_valid = false # repropose - LanItems.SetModified - @ret = { "workflow_sequence" => @seq } - # create titles - elsif @func == "Description" - @ret = { - # RichText label - "rich_text_title" => _("General Network Settings"), - # Menu label - "menu_title" => _("General &Network Settings"), - "id" => "networkmode" - } - # write the proposal - elsif @func == "Write" - Builtins.y2debug("lan_proposal did it") - else - Builtins.y2error("unknown function: %1", @func) - end - - # Finish - Builtins.y2debug("ret=%1", @ret) - Builtins.y2milestone("General network settings proposal finished") - Builtins.y2milestone("----------------------------------------") - deep_copy(@ret) - - # EOF - end - end -end - -Yast::GeneralProposalClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/clients/lan_proposal.rb new/yast2-network-3.1.53/src/clients/lan_proposal.rb --- old/yast2-network-3.1.50/src/clients/lan_proposal.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/clients/lan_proposal.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,205 +0,0 @@ -# encoding: utf-8 - -#*************************************************************************** -# -# Copyright (c) 2012 Novell, Inc. -# All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# -# To contact Novell about this file by physical or electronic mail, -# you may find current contact information at www.novell.com -# -#************************************************************************** -# File: clients/lan_proposal.ycp -# Package: Network configuration -# Summary: Lan configuration proposal -# Authors: Michal Svec <msvec(a)suse.cz> -# -module Yast - class LanProposalClient < Client - def main - Yast.import "UI" - - textdomain "network" - - # The main () - Builtins.y2milestone("----------------------------------------") - Builtins.y2milestone("Lan proposal started") - Builtins.y2milestone("Arguments: %1", WFM.Args) - - Yast.import "Arch" - Yast.import "Lan" - Yast.import "Linuxrc" - Yast.import "Popup" - Yast.import "Progress" - Yast.import "LanItems" - - Yast.include self, "network/lan/wizards.rb" - - @args = WFM.Args - - # yast2-installation calls the method this way: - # - # WFM::CallFunction( <proposal>, [<client function>, <map of arguments>]) - # - # see inst_proposal.ycp - @func = Ops.get_string(@args, 0, "") - @param = Ops.get_map(@args, 1, {}) - - @ret = {} - - # create a textual proposal - if @func == "MakeProposal" - @proposal = "" - @warning = nil - @warning_level = nil - @force_reset = Ops.get_boolean(@param, "force_reset", false) - - Builtins.y2milestone( - "lan_proposal/MakeProposal force_reset: %1", - @force_reset - ) - - if @force_reset || !LanItems.proposal_valid - LanItems.proposal_valid = true - - BusyPopup(_("Detecting network cards...")) - - @progress_orig = Progress.set(false) - - # NM wants us to repropose but while at it Lan::Read should not - # think it does a full reread and unset Lan::modified. #147270 - Lan.Read(@force_reset ? :nocache : :cache) - - if Lan.virt_net_proposal == nil - Lan.virt_net_proposal = VirtProposalRequired() - end - - Lan.Propose - Progress.set(@progress_orig) - - BusyPopupClose() - end - - @sum = Lan.Summary("proposal") - @proposal = Ops.get_string(@sum, 0, "") - - @ret = { - "preformatted_proposal" => @proposal, - "warning_level" => @warning_level, # TODO `warning - "warning" => @warning, # TODO WiFi but no encryption - "links" => Ops.get_list(@sum, 1, []) - } - # run the module - elsif @func == "AskUser" - @stored = Lan.Export - - @chosen_id = Ops.get_string(@param, "chosen_id", "") - @seq = :next - @match = Builtins.regexptokenize( - @chosen_id, - "^lan--wifi-encryption-(.*)" - ) - if @match != nil && @match != [] - Builtins.y2milestone("%1", @chosen_id) - @dev = Ops.get(@match, 0, "") - # unescape colons - @dev = Builtins.mergestring(Builtins.splitstring(@dev, "/"), ":") - - Builtins.foreach(LanItems.Items) do |row, value| - LanItems.current = row - if LanItems.IsCurrentConfigured - if Builtins.issubstring( - @dev, - Ops.get_string(LanItems.getCurrentItem, "ifcfg", "") - ) - LanItems.SetItem - raise Break - end - end - end if IsNotEmpty( - @dev - ) - - - # #113196: must create new dialog for proposal clients - Wizard.CreateDialog - Wizard.SetDesktopTitleAndIcon("lan") - @seq = AddressSequence("wire") - - Wizard.CloseDialog - else - @seq = LanAutoSequence("proposal") - end - - if @seq != :next - LanItems.Items = {} - Lan.Import(@stored) - end - @ret = { "workflow_sequence" => @seq } - # create titles - elsif @func == "Description" - @ret = { - # RichText label - "rich_text_title" => _("Network Interfaces"), - # Menu label - "menu_title" => _("&Network Interfaces"), - "id" => "lan" - } - # write the proposal - elsif @func == "Write" - if PackagesInstall(Lan.Packages) != :next - # popup already shown - Builtins.y2error("Packages installation failure, not saving") - elsif !Lan.virt_net_proposal && - (Linuxrc.display_ip || Linuxrc.vnc || Linuxrc.usessh) - Builtins.y2milestone("write only") - Lan.WriteOnly - else - Lan.Write - # With a little help from my friends: - # Let yast2-printer listen for CUPS broadcasts - SCR.Execute( - path(".target.bash_background"), - "test -f /usr/lib/YaST2/bin/listen_remote_ipp && /usr/lib/YaST2/bin/listen_remote_ipp 120" - ) - end - else - Builtins.y2error("unknown function: %1", @func) - end - - # Finish - Builtins.y2debug("ret=%1", @ret) - Builtins.y2milestone("Lan proposal finished") - Builtins.y2milestone("----------------------------------------") - deep_copy(@ret) - - # EOF - end - - # Decides if a proposal for virtualization host machine is required. - def VirtProposalRequired - # S390 has special requirements. See bnc#817943 - return false if Arch.s390 - - return true if PackageSystem.Installed("xen") && !Arch.is_xenU - return true if PackageSystem.Installed("kvm") - return true if PackageSystem.Installed("qemu") - - false - end - end -end - -Yast::LanProposalClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/clients/save_network.rb new/yast2-network-3.1.53/src/clients/save_network.rb --- old/yast2-network-3.1.50/src/clients/save_network.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/clients/save_network.rb 2014-05-06 07:33:52.000000000 +0200 @@ -29,6 +29,7 @@ # module Yast require "network/install_inf_convertor" + require "network/network_autoconfiguration" class SaveNetworkClient < Client include Logger @@ -257,6 +258,9 @@ WFM.SCRSetDefault(old_SCR) WFM.SCRClose(new_SCR) + NetworkAutoconfiguration.instance.configure_virtuals + NetworkAutoconfiguration.instance.configure_dns + LanUdevAuto.Write if Mode.autoinst SCR.Execute(path(".target.bash"), "chkconfig network on") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/include/network/lan/complex.rb new/yast2-network-3.1.53/src/include/network/lan/complex.rb --- old/yast2-network-3.1.50/src/include/network/lan/complex.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/include/network/lan/complex.rb 2014-05-06 07:33:52.000000000 +0200 @@ -57,57 +57,13 @@ Yast.include include_target, "network/services/dns.rb" Yast.include include_target, "network/lan/dhcp.rb" Yast.include include_target, "network/lan/s390.rb" + Yast.include include_target, "network/widgets.rb" @shown = false @wd = { - "MANAGED" => { - "widget" => :radio_buttons, - # radio button group label, method of setup - "label" => _( - "Network Setup Method" - ), - "items" => [ - # radio button label - # the user can control the network with the NetworkManager - # program - [ - "managed", - _("&User Controlled with NetworkManager") - ], - # radio button label - # ifup is a program name - [ - "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", ""), - "init" => fun_ref(method(:ManagedInit), "void (string)"), - "store" => fun_ref(method(:ManagedStore), "void (string, map)") - }, - "IPV6" => { - "widget" => :custom, - "custom_widget" => Frame( - _("IPv6 Protocol Settings"), - Left(CheckBox(Id(:ipv6), Opt(:notify), _("Enable IPv6"))) - ), - "opt" => [], - "help" => Ops.get_string(@help, "ipv6", ""), - "init" => fun_ref(method(:initIPv6), "void (string)"), - "handle" => fun_ref( - method(:handleIPv6), - "symbol (string, map)" - ), - "store" => fun_ref(method(:storeIPv6), "void (string, map)") - }, + "MANAGED" => managed_widget, + "IPV6" => ipv6_widget, "OVERVIEW" => { "widget" => :custom, "custom_widget" => VBox( @@ -130,7 +86,6 @@ method(:handleOverview), "symbol (string, map)" ), - # "store" : storeOverview, "help" => Ops.get_string( @help, "overview", @@ -310,89 +265,6 @@ !Arch.s390 || s390_DriverLoaded(devname) end - - def initIPv6(key) - UI.ChangeWidget(Id(:ipv6), :Value, Lan.ipv6 ? true : false) - - nil - end - - def handleIPv6(key, event) - event = deep_copy(event) - if Ops.get_string(event, "EventReason", "") == "ValueChanged" - Lan.SetIPv6(Convert.to_boolean(UI.QueryWidget(Id(:ipv6), :Value))) - end - nil - end - - def storeIPv6(key, event) - event = deep_copy(event) - if Convert.to_boolean(UI.QueryWidget(Id(:ipv6), :Value)) - Lan.SetIPv6(true) - else - Lan.SetIPv6(false) - end - - nil - end - - # Initialize the NetworkManager widget - # @param [String] key id of the widget - def ManagedInit(key) - 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 - end - - # Store the NetworkManager widget - # @param [String] key id of the widget - # @param [Hash] event the event being handled - def ManagedStore(key, event) - 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 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." - )) - end - end - - nil - end - def enableDisableButtons LanItems.current = Convert.to_integer( UI.QueryWidget(Id(:_hw_items), :CurrentItem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/include/network/widgets.rb new/yast2-network-3.1.53/src/include/network/widgets.rb --- old/yast2-network-3.1.50/src/include/network/widgets.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/include/network/widgets.rb 2014-05-06 07:33:52.000000000 +0200 @@ -41,6 +41,8 @@ Yast.import "IP" Yast.import "NetworkPopup" Yast.import "NetworkInterfaces" + Yast.import "NetworkService" + Yast.import "Lan" Yast.import "LanItems" Yast.include include_target, "network/complex.rb" @@ -286,6 +288,139 @@ } end + # Initialize the NetworkManager widget + # @param [String] key id of the widget + def ManagedInit(key) + 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 + end + + # Store the NetworkManager widget + # @param [String] key id of the widget + # @param [Hash] event the event being handled + def ManagedStore(key, event) + 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 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." + )) + end + end + + nil + end + + def managed_widget + { + "widget" => :radio_buttons, + # radio button group label, method of setup + "label" => _("Network Setup Method"), + "items" => [ + # radio button label + # the user can control the network with the NetworkManager + # program + [ + "managed", + _("&User Controlled with NetworkManager") + ], + # radio button label + # ifup is a program name + [ + "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", ""), + "init" => fun_ref(method(:ManagedInit), "void (string)"), + "store" => fun_ref(method(:ManagedStore), "void (string, map)") + } + end + + def initIPv6(key) + UI.ChangeWidget(Id(:ipv6), :Value, Lan.ipv6 ? true : false) + + nil + end + + def handleIPv6(key, event) + event = deep_copy(event) + if Ops.get_string(event, "EventReason", "") == "ValueChanged" + Lan.SetIPv6(Convert.to_boolean(UI.QueryWidget(Id(:ipv6), :Value))) + end + nil + end + + def storeIPv6(key, event) + event = deep_copy(event) + if Convert.to_boolean(UI.QueryWidget(Id(:ipv6), :Value)) + Lan.SetIPv6(true) + else + Lan.SetIPv6(false) + end + + nil + end + + def ipv6_widget + { + "widget" => :custom, + "custom_widget" => Frame( + _("IPv6 Protocol Settings"), + Left(CheckBox(Id(:ipv6), Opt(:notify), _("Enable IPv6"))) + ), + "opt" => [], + "help" => Ops.get_string(@help, "ipv6", ""), + "init" => fun_ref(method(:initIPv6), "void (string)"), + "handle" => fun_ref( + method(:handleIPv6), + "symbol (string, map)" + ), + "store" => fun_ref(method(:storeIPv6), "void (string, map)") + } + end + def GetDeviceDescription(device_id) device_name = NetworkInterfaces.GetValue(device_id, "NAME") if device_name == nil || device_name == "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/lib/network/network_autoconfiguration.rb new/yast2-network-3.1.53/src/lib/network/network_autoconfiguration.rb --- old/yast2-network-3.1.50/src/lib/network/network_autoconfiguration.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/lib/network/network_autoconfiguration.rb 2014-05-06 07:33:52.000000000 +0200 @@ -11,8 +11,12 @@ include Logger include Yast + Yast.import "Lan" Yast.import "LanItems" Yast.import "NetworkInterfaces" + Yast.import "Package" + Yast.import "DNS" + Yast.import "Arch" BASH_PATH = Path.new(".target.bash") @@ -56,6 +60,41 @@ activate_changes(dhcp_cards) end + # Propose configuration for virtual devices + # + # It checks if any of supported virtual machines were installed. If found, + # propose virtual device(s) configuration + def configure_virtuals + return if !virtual_proposal_required? + + log.info("NetworkAutoconfiguration: proposing virtual devices") + + Lan.ProposeVirtualized + + # avoid restarting network (installation can run via ssh, vnc, ...) + # Moreover virtual devices are not needed during first stage. So, it can + # wait for rebooting into just installed target + Lan.WriteOnly + end + + # Propose DNS and Hostname setup + def configure_dns + DNS.Read # handles NetworkConfig too + DNS.ProposeHostname # generate random hostname, if none known so far + + # propose settings + DNS.dhcp_hostname = !Arch.is_laptop + + # get default value, from control.xml + DNS.write_hostname = DNS.DefaultWriteHostname + + log.info("NetworkAutoconfiguration: proposing DNS / Hostname configuration") + log.info("dhcp hostname: #{DNS.dhcp_hostname}") + log.info("write hostname: #{DNS.write_hostname}") + + DNS.Write + end + private def network_cards LanItems.Read @@ -167,5 +206,17 @@ LanItems.SetItemSysconfigOpt(item_id, "DHCLIENT_SET_DEFAULT_ROUTE", value) end + # Decides if a proposal for virtualization host machine is required. + def virtual_proposal_required? + # S390 has special requirements. See bnc#817943 + return false if Arch.s390 + + return true if PackageSystem.Installed("xen") && !Arch.is_xenU + return true if PackageSystem.Installed("kvm") + return true if PackageSystem.Installed("qemu") + + false + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/src/modules/Lan.rb new/yast2-network-3.1.53/src/modules/Lan.rb --- old/yast2-network-3.1.50/src/modules/Lan.rb 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/src/modules/Lan.rb 2014-05-06 07:33:52.000000000 +0200 @@ -77,16 +77,6 @@ @write_only = false - # Current module information - # FIXME: MOD global map Module = $[]; - - # propose configuration for virtual networks (bridged) ? - @virt_net_proposal = nil - - # autoinstallation: if true, write_only is disabled and the network settings - # are applied at once, like during the normal installation. #128810, #168806 - # boolean start_immediately = false; - # ipv6 module @ipv6 = true @@ -637,23 +627,7 @@ ) end - Builtins.y2milestone("virt_net_proposal %1", @virt_net_proposal) - if Stage.cont && @virt_net_proposal == true && - (Linuxrc.usessh || Linuxrc.vnc || Linuxrc.display_ip) - - if ConfirmVirtProposal.instance.run == :ok - Builtins.y2milestone( - "Restarting network because of bridged proposal" - ) - NetworkService.Restart - end - # 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) - Builtins.y2milestone( - "For ssh or vnc installation don't reload/restart network during installation." - ) - elsif LanItems.force_restart + if LanItems.force_restart NetworkService.Restart else NetworkService.ReloadOrRestart @@ -834,9 +808,7 @@ status_nm = _("Traditional network setup with NetControl - ifup") # enable NetworkManager applet # for virtual network proposal (bridged) don't show hyperlink to enable networkmanager - link_nm = @virt_net_proposal ? - "..." : - Hyperlink(href_nm, _("Enable NetworkManager")) + link_nm = Hyperlink(href_nm, _("Enable NetworkManager")) end if @ipv6 @@ -852,28 +824,6 @@ # enable ipv6 support link_v6 = Hyperlink(href_v6, _("Enable IPv6")) end - # no exception needed for virtualbox* (bnc#648044) http://www.virtualbox.org/manual/ch06.html - if PackageSystem.Installed("xen") && !Arch.is_xenU || - PackageSystem.Installed("kvm") || - PackageSystem.Installed("qemu") - if @virt_net_proposal - href_virt_net = "virtual-revert" - status_virt_net = _( - "Proposed bridged configuration for virtual machine network" - ) - link_virt_net = Hyperlink( - href_virt_net, - _("Use non-bridged configuration") - ) - else - href_virt_net = "virtual-enable" - status_virt_net = _("Proposed non-bridged network configuration") - link_virt_net = Hyperlink( - href_virt_net, - _("Use bridged configuration") - ) - end - end descr = Builtins.sformat( "<ul><li>%1: %2 (%3)</li></ul> \n\t\t\t <ul><li>%4 (%5)</li></ul>", header_nm, @@ -1153,29 +1103,22 @@ Builtins.y2milestone("NetworkConfig::DHCP=%1", NetworkConfig.DHCP) # test if we have any virtualization installed - if @virt_net_proposal - Builtins.y2milestone( - "Virtualization [xen|kvm|qemu] detected - will propose virtualization network" - ) - ProposeVirtualized() - else - if !LanItems.nm_proposal_valid - if UseNetworkManager() - NetworkService.use_network_manager - else - NetworkService.use_netconfig - end - - LanItems.nm_proposal_valid = true + if !LanItems.nm_proposal_valid + if UseNetworkManager() + NetworkService.use_network_manager + else + NetworkService.use_netconfig end - if NetworkService.is_network_manager - ProposeNMInterfaces() + LanItems.nm_proposal_valid = true + end - LanItems.modified = true # #144139 workaround - Builtins.y2milestone("NM proposal") - return true - end + if NetworkService.is_network_manager + ProposeNMInterfaces() + + LanItems.modified = true # #144139 workaround + Builtins.y2milestone("NM proposal") + return true end # Something is already configured -> do nothing configured = false @@ -1482,7 +1425,6 @@ have_br end - publish :variable => :virt_net_proposal, :type => "boolean" publish :variable => :ipv6, :type => "boolean" publish :variable => :AbortFunction, :type => "block <boolean>" publish :variable => :bond_autoconf_slaves, :type => "list <string>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/testsuite/tests/Network_YaPI.out new/yast2-network-3.1.53/testsuite/tests/Network_YaPI.out --- old/yast2-network-3.1.50/testsuite/tests/Network_YaPI.out 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/testsuite/tests/Network_YaPI.out 2014-05-06 07:33:52.000000000 +0200 @@ -12,6 +12,7 @@ Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] Execute .target.bash "rpm -q --whatprovides SuSEfirewall2" 0 Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show SuSEfirewall2.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled SuSEfirewall2.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Read .etc.sysctl_conf."net.ipv4.ip_forward" nil Read .etc.sysctl_conf."net.ipv6.conf.all.forwarding" nil Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"] @@ -271,14 +272,21 @@ Write .network.value."eth0".STARTMODE "auto" true Write .network nil true Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] -Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password restart network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password start network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show SuSEfirewall2.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled SuSEfirewall2.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Read .etc.sysctl_conf."net.ipv4.ip_forward" nil Read .etc.sysctl_conf."net.ipv6.conf.all.forwarding" nil Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show SuSEfirewall2.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled SuSEfirewall2.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Write .etc.sysctl_conf."net.ipv4.ip_forward" "0" true Write .etc.sysctl_conf."net.ipv6.conf.all.forwarding" "0" true Write .etc.sysctl_conf nil true @@ -352,8 +360,13 @@ Write .network.value."eth3".STARTMODE "auto" true Write .network nil true Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] -Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password restart network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password start network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Dir .network.section: ["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth5.23"] Dir .network.value."eth0": ["BOOTPROTO", "STARTMODE"] Read .network.value."eth0".BOOTPROTO "dhcp4" @@ -420,5 +433,10 @@ Write .network.value."eth5.23".VLAN_ID "42" true Write .network nil true Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] -Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password restart network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password start network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.50/testsuite/tests/YaPI_bond.out new/yast2-network-3.1.53/testsuite/tests/YaPI_bond.out --- old/yast2-network-3.1.50/testsuite/tests/YaPI_bond.out 2014-04-25 14:38:44.000000000 +0200 +++ new/yast2-network-3.1.53/testsuite/tests/YaPI_bond.out 2014-05-06 07:33:52.000000000 +0200 @@ -18,5 +18,10 @@ Write .network.value."bond0".STARTMODE "auto" true Write .network nil true Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] -Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password restart network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password stop network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password start network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password show network.service --property=Id --property=MainPID --property=Description --property=LoadState --property=ActiveState --property=SubState --property=UnitFileState --property=FragmentPath " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] +Execute .target.bash_output " LANG=C TERM=dumb COLUMNS=1024 systemctl --no-legend --no-pager --no-ask-password is-enabled network.service " $["exit":0, "stderr":"", "stdout":"laptop.suse.cz"] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-nfs-server for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-nfs-server for openSUSE:Factory checked in at 2014-05-06 13:40:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nfs-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes 2014-04-05 14:42:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new/yast2-nfs-server.changes 2014-05-06 13:40:54.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 5 15:54:01 CEST 2014 - locilka(a)suse.com + +- Obsolete Service.Status calls replaced with Service.active? +- Finally dropped obsolete 'portmap' support (using only rpcbind) +- Adapted testsuite +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-nfs-server-3.1.5.tar.bz2 New: ---- yast2-nfs-server-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-server.spec ++++++ --- /var/tmp/diff_new_pack.lNcvWK/_old 2014-05-06 13:40:56.000000000 +0200 +++ /var/tmp/diff_new_pack.lNcvWK/_new 2014-05-06 13:40:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 Url: https://github.com/yast/yast-nfs-server ++++++ yast2-nfs-server-3.1.5.tar.bz2 -> yast2-nfs-server-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.changes new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.changes --- old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.changes 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.changes 2014-05-05 16:39:50.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon May 5 15:54:01 CEST 2014 - locilka(a)suse.com + +- Obsolete Service.Status calls replaced with Service.active? +- Finally dropped obsolete 'portmap' support (using only rpcbind) +- Adapted testsuite +- 3.1.6 + +------------------------------------------------------------------- Fri Mar 28 15:47:26 UTC 2014 - vmoravec(a)suse.com - Fix testsuite again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.spec new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.spec --- old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.spec 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.spec 2014-05-05 16:39:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 URL: https://github.com/yast/yast-nfs-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/src/modules/NfsServer.rb new/yast2-nfs-server-3.1.6/src/modules/NfsServer.rb --- old/yast2-nfs-server-3.1.5/src/modules/NfsServer.rb 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/src/modules/NfsServer.rb 2014-05-05 16:39:50.000000000 +0200 @@ -76,7 +76,8 @@ @have_nfslock = true - @portmapper = nil + # Since SLE 11, there's no portmapper, but rpcbind + @portmapper = "rpcbind" end # Function sets internal variable, which indicates, that any @@ -202,19 +203,6 @@ true end - # Get the used port mapper: since SLE11A3 we have rpcbind - # instead of portmap as the default (bnc#423026) - def Portmapper - if @portmapper == nil - @portmapper = Service.Find(["rpcbind", "portmap"]) - if @portmapper == "" - Builtins.y2error("No portmapper found") - @portmapper = "rpcbind" - end - end - @portmapper - end - # Saves NFS server configuration. (exports(5)) # Creates any missing directories. # @return true on success @@ -292,7 +280,7 @@ end end else - if !Service.Enable(Portmapper()) + if !Service.Enable(@portmapper) Report.Error(Service.Error) ok = false end @@ -308,23 +296,22 @@ end if @enable_nfsv4 - if Service.Status("idmapd") == 3 - if !Service.Start("idmapd") + if !Service.active?("idmapd") + unless Service.Start("idmapd") Report.Error( _("Unable to start idmapd. Check your domain setting.") ) ok = false end - end - if Service.Status("idmapd") == 0 - if !Service.Restart("idmapd") + else + unless Service.Restart("idmapd") Report.Error(_("Unable to restart idmapd.")) ok = false end end else - if Service.Status("idmapd") == 3 - if !Service.Stop("idmapd") + unless Service.active?("idmapd") + unless Service.Stop("idmapd") Report.Error(_("Unable to stop idmapd.")) ok = false end @@ -332,8 +319,8 @@ end if @nfs_security - if Service.Status("svcgssd") == 3 - if !Service.Start("svcgssd") + if !Service.active?("svcgssd") + unless Service.Start("svcgssd") # FIXME svcgssd is gone! (only nfsserver is left) Report.Error( _( @@ -342,18 +329,17 @@ ) ok = false end - end - if Service.Status("svcgssd") == 0 - if !Service.Restart("svcgssd") + else + unless Service.Restart("svcgssd") Report.Error( - _("'svcgssd' is already running. Unable to restart it.") + _("Unable to restart 'svcgssd' service.") ) ok = false end end else - if Service.Status("svcgssd") == 0 - if !Service.Stop("svcgssd") + if Service.active?("svcgssd") + unless Service.Stop("svcgssd") Report.Error(_("'svcgssd' is running. Unable to stop it.")) ok = false end @@ -361,16 +347,15 @@ end if !@write_only - if Service.Status(Portmapper()) != 0 - # portmap must not be started if it is running already (see bug # 9999) - Service.Start(Portmapper()) + unless Service.active?(@portmapper) + Service.Start(@portmapper) end Service.Stop("nfsserver") Service.Restart("nfslock") if @have_nfslock Service.Start("nfsserver") - if Service.Status("nfsserver") != 0 + unless Service.active?("nfsserver") # error popup message Report.Error( _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/testsuite/tests/readwrite2.out new/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.out --- old/yast2-nfs-server-3.1.5/testsuite/tests/readwrite2.out 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.out 2014-05-05 16:39:50.000000000 +0200 @@ -41,11 +41,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Log [DEPRECIATION] `Find' is deprecated; use `SystemdService.find` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Log Unable to restart the NFS server. Return false Dump @@ -91,9 +86,5 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Log Unable to restart the NFS server. Return false -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-nfs-client for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2014-05-06 13:40:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nfs-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2014-04-05 14:42:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2014-05-06 13:40:53.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 5 14:49:12 CEST 2014 - locilka(a)suse.com + +- Obsolete Service.Status replaced with new Service.active? +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-3.1.3.tar.bz2 New: ---- yast2-nfs-client-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.p5u0Ck/_old 2014-05-06 13:40:54.000000000 +0200 +++ /var/tmp/diff_new_pack.p5u0Ck/_new 2014-05-06 13:40:54.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 3.1.3 +Version: 3.1.4 Release: 0 Url: https://github.com/yast/yast-nfs-client ++++++ yast2-nfs-client-3.1.3.tar.bz2 -> yast2-nfs-client-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.changes new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.changes --- old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.changes 2014-03-28 17:57:03.000000000 +0100 +++ new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.changes 2014-05-05 15:52:50.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 5 14:49:12 CEST 2014 - locilka(a)suse.com + +- Obsolete Service.Status replaced with new Service.active? +- 3.1.4 + +------------------------------------------------------------------- Fri Mar 28 16:54:19 UTC 2014 - vmoravec(a)suse.com - Fix failing tests again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.spec new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.spec --- old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.spec 2014-03-28 17:57:03.000000000 +0100 +++ new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.spec 2014-05-05 15:52:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 3.1.3 +Version: 3.1.4 Release: 0 Url: https://github.com/yast/yast-nfs-client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/src/modules/Nfs.rb new/yast2-nfs-client-3.1.4/src/modules/Nfs.rb --- old/yast2-nfs-client-3.1.3/src/modules/Nfs.rb 2014-03-28 17:57:03.000000000 +0100 +++ new/yast2-nfs-client-3.1.4/src/modules/Nfs.rb 2014-05-05 15:52:50.000000000 +0200 @@ -34,6 +34,7 @@ Yast.import "PackageSystem" Yast.import "PackagesProposal" Yast.import "Wizard" + Yast.import "Message" Yast.include self, "nfs/routines.rb" @@ -519,15 +520,17 @@ Progress.NextStage if Ops.greater_than(Builtins.size(@nfs_entries), 0) - if Service.Status(@portmapper) != 0 - # portmap must not be started if it is running already (see bug # 9999) - Service.Start(@portmapper) + # portmap must not be started if it is running already (see bug # 9999) + Service.Start(@portmapper) unless Service.active?(@portmapper) + + unless Service.active?(@portmapper) + Report.Error(Message.CannotStartService(@portmapper)) + return false end Service.Start("nfs") - # #74597: if all mounts are noauto, $? is 6 (unconfigured) - status = Service.Status("nfs") - if status != 0 && status != 6 + + unless Service.active?("nfs") # error popup message Report.Error(_("Unable to mount the NFS entries from /etc/fstab.")) return false @@ -614,8 +617,8 @@ # start portmapper if it isn't running - if Service.Status(portmapper) != 0 - if Service.Start(portmapper) == false + unless Service.active?(portmapper) + unless Service.Start(portmapper) Builtins.y2warning("%1 cannot be started", portmapper) return nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite.out new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite.out --- old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite.out 2014-03-28 17:57:03.000000000 +0100 +++ new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite.out 2014-05-05 15:52:50.000000000 +0200 @@ -15,9 +15,7 @@ Write .etc.idmapd_conf.value.General.Domain "localhost" true Write .etc.idmapd_conf nil true Write .sysconfig.nfs.NFS_SECURITY_GSS "yes" true -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log Unable to mount the NFS entries from /etc/fstab. +Log Cannot start 'portmap' service Return false Dump Write KO Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite2.out new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite2.out --- old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite2.out 2014-03-28 17:57:03.000000000 +0100 +++ new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite2.out 2014-05-05 15:52:50.000000000 +0200 @@ -17,9 +17,7 @@ Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log Unable to mount the NFS entries from /etc/fstab. +Log Cannot start 'portmap' service Return false Dump Dump Read - nfs is in use & stopped @@ -40,9 +38,7 @@ Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] true Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log Unable to mount the NFS entries from /etc/fstab. +Log Cannot start 'portmap' service Return false Dump Dump Read - nfs not used & running -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-kdump for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-kdump for openSUSE:Factory checked in at 2014-05-06 13:40:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-kdump (Old) and /work/SRC/openSUSE:Factory/.yast2-kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-kdump/yast2-kdump.changes 2014-03-21 12:14:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-kdump.new/yast2-kdump.changes 2014-05-06 13:40:51.000000000 +0200 @@ -1,0 +2,13 @@ +Mon May 5 11:03:34 UTC 2014 - jreidinger(a)suse.com + +- use directly kdump service instead of boot.kdump wrapper + (bnc#873733) +- 3.1.11 + +------------------------------------------------------------------- +Wed Apr 30 12:02:41 CEST 2014 - snwint(a)suse.de + +- require kdump, but not yet on aarch64 (bnc #875765) +- 3.1.10 + +------------------------------------------------------------------- Old: ---- yast2-kdump-3.1.9.tar.bz2 New: ---- yast2-kdump-3.1.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-kdump.spec ++++++ --- /var/tmp/diff_new_pack.VgBhdz/_old 2014-05-06 13:40:52.000000000 +0200 +++ /var/tmp/diff_new_pack.VgBhdz/_new 2014-05-06 13:40:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 3.1.9 +Version: 3.1.11 Release: 0 Url: https://github.com/yast/yast-kdump @@ -36,7 +36,12 @@ BuildRequires: yast2-storage BuildRequires: yast2-testsuite -Recommends: kdump makedumpfile +Recommends: makedumpfile +%ifarch aarch64 +Recommends: kdump +%else +Requires: kdump +%endif # Wizard::SetDesktopTitleAndIcon BuildRequires: yast2 >= 2.21.22 ++++++ yast2-kdump-3.1.9.tar.bz2 -> yast2-kdump-3.1.11.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.9/package/yast2-kdump.changes new/yast2-kdump-3.1.11/package/yast2-kdump.changes --- old/yast2-kdump-3.1.9/package/yast2-kdump.changes 2014-03-19 14:30:26.000000000 +0100 +++ new/yast2-kdump-3.1.11/package/yast2-kdump.changes 2014-05-05 15:10:48.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Mon May 5 11:03:34 UTC 2014 - jreidinger(a)suse.com + +- use directly kdump service instead of boot.kdump wrapper + (bnc#873733) +- 3.1.11 + +------------------------------------------------------------------- +Wed Apr 30 12:02:41 CEST 2014 - snwint(a)suse.de + +- require kdump, but not yet on aarch64 (bnc #875765) +- 3.1.10 + +------------------------------------------------------------------- Wed Mar 19 13:28:54 CET 2014 - snwint(a)suse.de - kdump for all (bnc #869086, bnc #804512) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.9/package/yast2-kdump.spec new/yast2-kdump-3.1.11/package/yast2-kdump.spec --- old/yast2-kdump-3.1.9/package/yast2-kdump.spec 2014-03-19 14:30:26.000000000 +0100 +++ new/yast2-kdump-3.1.11/package/yast2-kdump.spec 2014-05-05 15:10:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-kdump -Version: 3.1.9 +Version: 3.1.11 Release: 0 Url: https://github.com/yast/yast-kdump @@ -31,7 +31,12 @@ BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: rubygem-rspec -Recommends: kdump makedumpfile +Recommends: makedumpfile +%ifarch aarch64 +Recommends: kdump +%else +Requires: kdump +%endif # Wizard::SetDesktopTitleAndIcon BuildRequires: yast2 >= 2.21.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-kdump-3.1.9/src/include/kdump/uifunctions.rb new/yast2-kdump-3.1.11/src/include/kdump/uifunctions.rb --- old/yast2-kdump-3.1.9/src/include/kdump/uifunctions.rb 2014-03-19 14:30:26.000000000 +0100 +++ new/yast2-kdump-3.1.11/src/include/kdump/uifunctions.rb 2014-05-05 15:10:48.000000000 +0200 @@ -227,19 +227,12 @@ # Function initializes option "Enable/Disable kdump" def InitEnableDisalbeKdump(key) - if Mode.installation - if Kdump.add_crashkernel_param - UI.ChangeWidget(Id("EnableDisalbeKdump"), :Value, "enable_kdump") - else - UI.ChangeWidget(Id("EnableDisalbeKdump"), :Value, "disable_kdump") - end - else - if Kdump.add_crashkernel_param && Service.Status("boot.kdump") == 0 - UI.ChangeWidget(Id("EnableDisalbeKdump"), :Value, "enable_kdump") - else - UI.ChangeWidget(Id("EnableDisalbeKdump"), :Value, "disable_kdump") - end - end + enable = Kdump.add_crashkernel_param + enable &&= Service.enabled?(KdumpClass::KDUMP_SERVICE_NAME) unless Mode.installation + + value = enable ? "enable_kdump" : "disable_kdump" + + UI.ChangeWidget(Id("EnableDisalbeKdump"), :Value, value) nil end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-05-06 13:40:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-04-13 13:13:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-05-06 13:40:49.000000000 +0200 @@ -1,0 +2,110 @@ +Mon May 5 11:38:34 UTC 2014 - vmoravec(a)suse.com + +- Fix getting the status of sysvinit services (bnc#876144) +- 3.1.60 + +------------------------------------------------------------------- +Fri May 2 14:22:48 UTC 2014 - jreidinger(a)suse.com + +- save_y2logs: store target of symlinks as symlinks are useless +- 3.1.59 + +------------------------------------------------------------------- +Fri May 2 08:43:37 UTC 2014 - jsrain(a)suse.cz + +- fixed incorrect function name (bnc#876105) +- 3.1.58 + +------------------------------------------------------------------- +Tue Apr 29 12:46:18 CEST 2014 - locilka(a)suse.com + +- Fixed Product lazy loading in Update mode (bnc#875605) +- 3.1.57 + +------------------------------------------------------------------- +Tue Apr 29 11:27:09 CEST 2014 - gs(a)suse.de + +- Add support for 'stop' and 'restart' of services in inst-sys + (related to bnc #873057, bnc #873448) +- 3.1.56 + +------------------------------------------------------------------- +Mon Apr 28 16:41:57 CEST 2014 - locilka(a)suse.com + +- Fixed SlideShow table header to match the reality (bnc#874823) +- 3.1.55 + +------------------------------------------------------------------- +Thu Apr 24 15:59:44 CEST 2014 - locilka(a)suse.com + +- Product library changed to read data only from os-release and + libzypp (bnc#873877), no more from content file +- 3.1.54 + +------------------------------------------------------------------- +Tue Apr 22 15:05:41 CEST 2014 - locilka(a)suse.com + +- Published Service.Active (used from Perl) +- 3.1.53 + +------------------------------------------------------------------- +Tue Apr 22 11:03:21 CEST 2014 - locilka(a)suse.com + +- Removed Product.patterns (replaced by Packages.default_patterns) + (bnc#873923) +- 3.1.52 + +------------------------------------------------------------------- +Thu Apr 17 15:08:41 UTC 2014 - mvidner(a)suse.com + +- rewrote URLRecode.pm to URLRecode.rb so that 'yast2 repositories' + can run without Perl bindings +- 3.1.51 + +------------------------------------------------------------------- +Thu Apr 17 11:11:01 CEST 2014 - locilka(a)suse.com + +- Decreased number of logs coming from Hooks (to enhance logs + readability) +- 3.1.50 + +------------------------------------------------------------------- +Thu Apr 17 08:22:23 UTC 2014 - vmoravec(a)suse.com + +- Add path to deprecation warnings (bnc#873973) +- Fix enabling LSB services during installation (bnc#873929) +- 3.1.49 + +------------------------------------------------------------------- +Wed Apr 16 13:02:54 UTC 2014 - jreidinger(a)suse.com + +- ensure that dialog was closed even if exception is raised + (bnc#873916) +- save_y2logs: store versions of packages in inst-sys +- 3.1.48 + +------------------------------------------------------------------- +Wed Apr 16 11:46:55 UTC 2014 - mfilka(a)suse.com + +- bnc#869661 + - fixed internal error raised in inst_lan during update +- 3.1.47 + +------------------------------------------------------------------- +Tue Apr 15 09:09:57 CEST 2014 - locilka(a)suse.com + +- Changed Product.FindBaseProducts to throw an exception if no + base products are found in installation (bnc#873458, bnc#873377) +- 3.1.46 + +------------------------------------------------------------------- +Mon Apr 14 15:11:22 CEST 2014 - locilka(a)suse.com + +- Changed OSRelease not to read content file instead of os-release + file in inst-sys (bnc#873366) +- Changed Product to use OSRelease.ReleaseInformation as :name + instead of creating it from ReleaseName and ReleaseVersion, + these are only used as fallback (bnc#873366) +- 3.1.45 + +------------------------------------------------------------------- Old: ---- yast2-3.1.44.tar.bz2 New: ---- yast2-3.1.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.7wyPeG/_old 2014-05-06 13:40:50.000000000 +0200 +++ /var/tmp/diff_new_pack.7wyPeG/_new 2014-05-06 13:40:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.44 +Version: 3.1.60 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.44.tar.bz2 -> yast2-3.1.60.tar.bz2 ++++++ ++++ 1885 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-storage for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-05-06 13:40:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-04-13 13:13:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-05-06 13:40:47.000000000 +0200 @@ -1,0 +2,19 @@ +Mon May 05 12:04:00 CEST 2014 - aschnell(a)suse.de + +- fixed space adjustment in proposal for snapshots (bnc#876127) +- version 3.1.22 + +------------------------------------------------------------------- +Wed Apr 30 15:28:35 CEST 2014 - aschnell(a)suse.de + +- fixed importing mount points with btrfs (bnc#874288) +- version 3.1.21 + +------------------------------------------------------------------- +Tue Apr 29 17:51:15 CEST 2014 - aschnell(a)suse.de + +- do not create boot subvolumes in the proposal if a boot partition + is proposed (bnc#874551) +- version 3.1.20 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.19.tar.bz2 New: ---- yast2-storage-3.1.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.dlk2Oi/_old 2014-05-06 13:40:48.000000000 +0200 +++ /var/tmp/diff_new_pack.dlk2Oi/_new 2014-05-06 13:40:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.19 +Version: 3.1.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.19.tar.bz2 -> yast2-storage-3.1.22.tar.bz2 ++++++ ++++ 1784 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-inetd for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-inetd for openSUSE:Factory checked in at 2014-05-06 13:40:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-inetd (Old) and /work/SRC/openSUSE:Factory/.yast2-inetd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-inetd" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-inetd/yast2-inetd.changes 2014-04-05 14:42:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-inetd.new/yast2-inetd.changes 2014-05-06 13:40:45.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 5 13:21:51 CEST 2014 - locilka(a)suse.com + +- Replaced obsolete Service.* calls with new ones +- Inetd.netd_status* are now boolean values +- Adapted testsuite +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-inetd-3.1.4.tar.bz2 New: ---- yast2-inetd-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-inetd.spec ++++++ --- /var/tmp/diff_new_pack.O6MBf4/_old 2014-05-06 13:40:46.000000000 +0200 +++ /var/tmp/diff_new_pack.O6MBf4/_new 2014-05-06 13:40:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.4 +Version: 3.1.5 Release: 0 Url: https://github.com/yast/yast-inetd ++++++ yast2-inetd-3.1.4.tar.bz2 -> yast2-inetd-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/package/yast2-inetd.changes new/yast2-inetd-3.1.5/package/yast2-inetd.changes --- old/yast2-inetd-3.1.4/package/yast2-inetd.changes 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/package/yast2-inetd.changes 2014-05-05 13:49:49.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon May 5 13:21:51 CEST 2014 - locilka(a)suse.com + +- Replaced obsolete Service.* calls with new ones +- Inetd.netd_status* are now boolean values +- Adapted testsuite +- 3.1.5 + +------------------------------------------------------------------- Fri Mar 28 09:56:24 UTC 2014 - vmoravec(a)suse.com - Fix failing testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/package/yast2-inetd.spec new/yast2-inetd-3.1.5/package/yast2-inetd.spec --- old/yast2-inetd-3.1.4/package/yast2-inetd.spec 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/package/yast2-inetd.spec 2014-05-05 13:49:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 3.1.4 +Version: 3.1.5 Release: 0 Url: https://github.com/yast/yast-inetd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/clients/inetd_auto.rb new/yast2-inetd-3.1.5/src/clients/inetd_auto.rb --- old/yast2-inetd-3.1.4/src/clients/inetd_auto.rb 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/clients/inetd_auto.rb 2014-05-05 13:49:49.000000000 +0200 @@ -100,7 +100,7 @@ @po = Progress.set(false) @ret = Inetd.Read Progress.set(@po) - Inetd.netd_status = Service.Status("xinetd") + Inetd.netd_status = Service.active?("xinetd") Inetd.netd_conf = Builtins.maplist(Inetd.netd_conf) do |s| Builtins.add(s, "changed", true) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/include/inetd/dialogs.rb new/yast2-inetd-3.1.5/src/include/inetd/dialogs.rb --- old/yast2-inetd-3.1.4/src/include/inetd/dialogs.rb 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/include/inetd/dialogs.rb 2014-05-05 13:49:49.000000000 +0200 @@ -426,7 +426,7 @@ new_state = false # if service active, enable editting - new_state = true if Inetd.netd_status == 0 + new_state = Inetd.netd_status UI.ChangeWidget(Id(:editable), :Value, new_state) UI.ChangeWidget(Id(:table), :Enabled, new_state) UI.ChangeWidget(Id(:create), :Enabled, new_state) @@ -468,11 +468,7 @@ UI.ChangeWidget(Id(:toggle_menu), :Enabled, new_state2) UI.ChangeWidget(Id(:switch_active), :Enabled, new_state2) - if new_state2 - Inetd.netd_status = 0 - else - Inetd.netd_status = -1 - end + Inetd.netd_status = new_state2 # create new entry elsif ret == :create selected_item = Convert.to_string( @@ -779,8 +775,8 @@ end if ret == :next - if Inetd.netd_status == 0 && IsAnyServiceEnabled(Inetd.netd_conf) == :no - Inetd.netd_status = -1 + if Inetd.netd_status && IsAnyServiceEnabled(Inetd.netd_conf) == :no + Inetd.netd_status = false # Translators: Popup::Warning Popup.Warning( _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/include/inetd/routines.rb new/yast2-inetd-3.1.5/src/include/inetd/routines.rb --- old/yast2-inetd-3.1.4/src/include/inetd/routines.rb 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/include/inetd/routines.rb 2014-05-05 13:49:49.000000000 +0200 @@ -30,6 +30,8 @@ # $Id$ module Yast module InetdRoutinesInclude + TCPD_BINARY = "/usr/sbin/tcpd" + def initialize_inetd_routines(include_target) Yast.import "UI" @@ -68,27 +70,26 @@ nil end - # Used for cpmparisons whether the servers match: + # Used for comparisons whether the servers match: # If server is /usr/sbin/tcpd, consider server_args instead. - # Then take the firse word (strips arguments or the parenthesized pkg name). + # Then take the first word (strips arguments or the parenthesized pkg name). # Then take the last slash-delimited component. # For sparse matching: nil is returned if server is nil # (or if server args is nil AND is needed) + # # @param [String] server "server" field of a service # @param [String] server_args "server_args" field of a service # @return basename of the real server def GetServerBasename(server, server_args) - result = server - # discard tcpd - result = server_args if result == "/usr/sbin/tcpd" + result = (server == TCPD_BINARY ? server_args : server).dup + # check nil - if result != nil - # program only - result = String.FirstChunk(result, " \t") - # basename - comp = Builtins.splitstring(result, "/") - result = Ops.get(comp, Ops.subtract(Builtins.size(comp), 1), "") + if result && !result.empty? + # find the server name + server_path = result.strip.split(/[ \t]/).first + result = File.basename(server_path) end + result end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/src/modules/Inetd.rb new/yast2-inetd-3.1.5/src/modules/Inetd.rb --- old/yast2-inetd-3.1.4/src/modules/Inetd.rb 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/src/modules/Inetd.rb 2014-05-05 13:49:49.000000000 +0200 @@ -157,7 +157,7 @@ # Is xinetd running? # These variables contains return values from Service::Status() calls. - @netd_status = -1 + @netd_status = false @netd_status_read = @netd_status # This variable is used for new iid "generator" @@ -205,7 +205,7 @@ :to => "list <map <string, any>>" ) - @netd_status = Service.Status("xinetd") + @netd_status = Service.active?("xinetd") @netd_status_read = @netd_status return false if Abort() @@ -283,7 +283,8 @@ if @write_only # enable/disable the current service - Service.Adjust("xinetd", @netd_status == 0 ? "enable" : "disable") + @netd_status ? Service.enable("xinetd") : Service.disable("xinetd") + # YUCK, looks like autoinst part, should be done in inetd_auto.ycp new_conf = [] new_conf = Convert.convert( @@ -296,13 +297,13 @@ else SCR.Write(path(".etc.xinetd_conf.services"), @netd_conf) - if @netd_status != 0 - if @netd_status_read == 0 + if @netd_status + if !@netd_status_read Builtins.y2milestone( "%1 was running --- stoping and disabling service", "xinetd" ) - Service.Stop("xinetd") if !@write_only + Service.Stop("xinetd") unless @write_only Service.Disable("xinetd") else Builtins.y2milestone( @@ -312,18 +313,18 @@ end else # current is running - only reload - if @netd_status_read == 0 + if @netd_status_read Builtins.y2milestone( - "%1 was running --- calling force-reload", + "%1 was running --- calling reload", "xinetd" ) - Service.RunInitScript("xinetd", "force-reload") if !@write_only + Service.reload("xinetd") unless @write_only else Builtins.y2milestone( "%1 was stopped --- enabling and starting service", "xinetd" ) - Service.Start("xinetd") if !@write_only + Service.Start("xinetd") unless @write_only Service.Enable("xinetd") end end @@ -475,7 +476,8 @@ settings = deep_copy(settings) #y2milestone("settings = %1", settings); @netd_conf = mergeWithDefaults(Ops.get_list(settings, "netd_conf", [])) - @netd_status = Ops.get_integer(settings, "netd_status", -1) + # old profile can still use integer value (0 == true) + @netd_status = [0, true].include?(settings["netd_status"]) # common variables @last_created = Ops.get_integer(settings, "last_created", 0) @@ -577,7 +579,6 @@ # (For use by autoinstallation.) # @return [Hash] Dumped settings (later acceptable by Import ()) def Export - # sleep(3000); config = {} config = Builtins.add(config, "netd_conf", getChanged(@netd_conf)) config = Builtins.add(config, "netd_status", @netd_status) @@ -790,8 +791,8 @@ publish :variable => :auto_mode, :type => "boolean" publish :variable => :autoyast_initialized, :type => "boolean" publish :variable => :netd_conf, :type => "list <map <string, any>>" - publish :variable => :netd_status, :type => "integer" - publish :variable => :netd_status_read, :type => "integer" + publish :variable => :netd_status, :type => "boolean" + publish :variable => :netd_status_read, :type => "boolean" publish :variable => :last_created, :type => "integer" publish :function => :Read, :type => "boolean ()" publish :function => :MergeEditedWithSystem, :type => "list <map <string, any>> (list <map <string, any>>, list <map <string, any>>)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/testsuite/tests/Inetd.out new/yast2-inetd-3.1.5/testsuite/tests/Inetd.out --- old/yast2-inetd-3.1.4/testsuite/tests/Inetd.out 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/testsuite/tests/Inetd.out 2014-05-05 13:49:49.000000000 +0200 @@ -5,7 +5,6 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Return true Dump Dump Write --- write services @@ -21,7 +20,6 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Return true Dump Dump Write --- write xinetd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/testsuite/tests/Inetd2.out new/yast2-inetd-3.1.5/testsuite/tests/Inetd2.out --- old/yast2-inetd-3.1.4/testsuite/tests/Inetd2.out 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/testsuite/tests/Inetd2.out 2014-05-05 13:49:49.000000000 +0200 @@ -5,7 +5,6 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services nil -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Return true Dump Dump Write --- write inetd @@ -20,7 +19,6 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services nil -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Return true Dump Dump Write --- write inetd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-3.1.4/testsuite/tests/Inetd3.out new/yast2-inetd-3.1.5/testsuite/tests/Inetd3.out --- old/yast2-inetd-3.1.4/testsuite/tests/Inetd3.out 2014-03-28 14:34:06.000000000 +0100 +++ new/yast2-inetd-3.1.5/testsuite/tests/Inetd3.out 2014-05-05 13:49:49.000000000 +0200 @@ -2,7 +2,6 @@ Dump Read --- read all services Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Return true Dump Dump Write --- write xinetd @@ -12,7 +11,6 @@ Dump --- Dump Read .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Return true Dump Dump Write --- write xinetd -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2014-05-06 13:40:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-update (Old) and /work/SRC/openSUSE:Factory/.yast2-update.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-update" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes 2014-04-05 14:42:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes 2014-05-06 13:40:43.000000000 +0200 @@ -1,0 +2,22 @@ +Fri May 2 12:36:53 UTC 2014 - jreidinger(a)suse.com + +- Fix internal error caused by wrong type passed as string append + (bnc#876136) +- 3.1.7 + +------------------------------------------------------------------- +Tue Apr 22 10:52:06 CEST 2014 - locilka(a)suse.com + +- Replaced old Product.patterns with new Packages.default_patterns + (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- +Tue Apr 15 15:57:20 CEST 2014 - locilka(a)suse.com + +- Warning user that changing update mode from "patterns" to + "update only installed rpms" might lead into broken system. + Only if "patterns" were the default selection (bnc#873122). +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-update-3.1.4.tar.bz2 New: ---- yast2-update-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.DDdVqe/_old 2014-05-06 13:40:44.000000000 +0200 +++ /var/tmp/diff_new_pack.DDdVqe/_new 2014-05-06 13:40:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.4 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,8 +43,9 @@ # OSRelease Requires: yast2 >= 3.1.28 Requires: yast2-installation -# Function SelectKernelPackages has been moved to Packages module (bnc #326269). -Requires: yast2-packager >= 2.17.27 + +# Packages.default_patterns +Requires: yast2-packager >= 3.1.10 # moved into yast2-update from yast2-installation # to remove dependency on yast2-storage ++++++ yast2-update-3.1.4.tar.bz2 -> yast2-update-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/package/yast2-update.changes new/yast2-update-3.1.7/package/yast2-update.changes --- old/yast2-update-3.1.4/package/yast2-update.changes 2014-03-28 15:53:02.000000000 +0100 +++ new/yast2-update-3.1.7/package/yast2-update.changes 2014-05-02 14:43:50.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Fri May 2 12:36:53 UTC 2014 - jreidinger(a)suse.com + +- Fix internal error caused by wrong type passed as string append + (bnc#876136) +- 3.1.7 + +------------------------------------------------------------------- +Tue Apr 22 10:52:06 CEST 2014 - locilka(a)suse.com + +- Replaced old Product.patterns with new Packages.default_patterns + (bnc#873923) +- 3.1.6 + +------------------------------------------------------------------- +Tue Apr 15 15:57:20 CEST 2014 - locilka(a)suse.com + +- Warning user that changing update mode from "patterns" to + "update only installed rpms" might lead into broken system. + Only if "patterns" were the default selection (bnc#873122). +- 3.1.5 + +------------------------------------------------------------------- Fri Mar 28 15:02:22 CET 2014 - locilka(a)suse.com - Fixed loading kernel modules while probing disks (bnc#869091) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/package/yast2-update.spec new/yast2-update-3.1.7/package/yast2-update.spec --- old/yast2-update-3.1.4/package/yast2-update.spec 2014-03-28 15:53:02.000000000 +0100 +++ new/yast2-update-3.1.7/package/yast2-update.spec 2014-05-02 14:43:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.4 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,8 +45,9 @@ # OSRelease Requires: yast2 >= 3.1.28 Requires: yast2-installation -# Function SelectKernelPackages has been moved to Packages module (bnc #326269). -Requires: yast2-packager >= 2.17.27 + +# Packages.default_patterns +Requires: yast2-packager >= 3.1.10 # moved into yast2-update from yast2-installation # to remove dependency on yast2-storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/src/clients/inst_update.rb new/yast2-update-3.1.7/src/clients/inst_update.rb --- old/yast2-update-3.1.4/src/clients/inst_update.rb 2014-03-28 15:53:02.000000000 +0100 +++ new/yast2-update-3.1.7/src/clients/inst_update.rb 2014-05-02 14:43:50.000000000 +0200 @@ -218,19 +218,29 @@ end if (@ret == :next || @ret == :ok) && Pkg.RestoreState(true) - @something_changed = false - - if UI.QueryWidget(Id(:notupgrade), :Value) != - Update.onlyUpdateInstalled - @something_changed = true - end - - if @something_changed && Packages.base_selection_modified - # yes/no question - if !Popup.YesNo( - _("Do you really want\nto reset your detailed selection?") + new_onlyUpdateInstalled = UI.QueryWidget(Id(:notupgrade), :Value) + # Selection has changed + if Update.onlyUpdateInstalled != new_onlyUpdateInstalled + # BNC#873122 + # The default is 'do not onlyUpdateInstalled' + # New status is 'do onlyUpdateInstalled' + if !Update.default_onlyUpdateInstalled && new_onlyUpdateInstalled + next unless Popup::AnyQuestion( + Label.WarningMsg, + # warning / question + _( + "Changing the update method to 'Update packages only' might\n" + + "lead into non-bootable or non-working system if you do not\n" + + "adjust the list of packages yourself.\n\n" + + "Really continue?" + ), + Label.YesButton, + Label.NoButton, + :focus_no ) - next + elsif Packages.base_selection_modified + # yes/no question + next unless Popup.YesNo(_("Do you really want\nto reset your detailed selection?")) end end end @@ -242,10 +252,7 @@ Update.did_init1 = false @b1 = Update.onlyUpdateInstalled - Update.onlyUpdateInstalled = Convert.to_boolean( - UI.QueryWidget(Id(:notupgrade), :Value) - ) - # Update::deleteOldPackages = (boolean) UI::QueryWidget (`id(`delete), `Value); + Update.onlyUpdateInstalled = UI.QueryWidget(Id(:notupgrade), :Value) if @b1 != Update.onlyUpdateInstalled || @details_pressed Update.manual_interaction = true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/src/clients/update_proposal.rb new/yast2-update-3.1.7/src/clients/update_proposal.rb --- old/yast2-update-3.1.4/src/clients/update_proposal.rb 2014-03-28 15:53:02.000000000 +0100 +++ new/yast2-update-3.1.7/src/clients/update_proposal.rb 2014-05-02 14:43:50.000000000 +0200 @@ -28,6 +28,8 @@ # $Id$ module Yast class UpdateProposalClient < Client + include Yast::Logger + def main Yast.import "Pkg" Yast.import "UI" @@ -504,14 +506,10 @@ Builtins.foreach(restore) { |res| Pkg.ResolvableInstall(res, :product) } Update.SetDesktopPattern if !Update.onlyUpdateInstalled - if !Update.onlyUpdateInstalled && # just consider already installed packages - !ProductFeatures.GetBooleanFeature( - "software", - "only_update_installed" - ) - Builtins.foreach(Product.patterns) do |pat| - Builtins.y2milestone("Pre-select pattern %1", pat) - Pkg.ResolvableInstall(pat, :pattern) + if !Update.OnlyUpdateInstalled + Packages.default_patterns.each do |pattern| + select_pattern_result = Pkg.ResolvableInstall(pattern, :pattern) + log.info "Pre-select pattern #{pattern}: #{select_pattern_result}" end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/src/modules/Update.rb new/yast2-update-3.1.7/src/modules/Update.rb --- old/yast2-update-3.1.4/src/modules/Update.rb 2014-03-28 15:53:02.000000000 +0100 +++ new/yast2-update-3.1.7/src/modules/Update.rb 2014-05-02 14:43:50.000000000 +0200 @@ -420,6 +420,7 @@ # y2milestone ("deleteOldPackages %1", deleteOldPackages); @onlyUpdateInstalled = OnlyUpdateInstalled() + @default_onlyUpdateInstalled = deep_copy(@onlyUpdateInstalled) Builtins.y2milestone("onlyUpdateInstalled %1", @onlyUpdateInstalled) @disallow_upgrade = false @@ -857,6 +858,7 @@ publish :variable => :did_init2, :type => "boolean" publish :variable => :last_runlevel, :type => "integer" publish :variable => :onlyUpdateInstalled, :type => "boolean" + publish :variable => :default_onlyUpdateInstalled, :type => "boolean" publish :variable => :selected_selection, :type => "string" publish :variable => :products_incompatible, :type => "boolean" publish :variable => :updateBasePackages, :type => "boolean" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 06 May '14

06 May '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-05-06 13:40:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-04-26 11:45:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-05-06 13:40:39.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 2 08:31:32 UTC 2014 - jreidinger(a)suse.com + +- fix activating partitions with number bigger then 4 on GPT disks + with legacy x86 boot (bnc#875757) +- 3.1.32 + +------------------------------------------------------------------- +Wed Apr 30 16:23:57 UTC 2014 - jreidinger(a)suse.com + +- handle diskless nfs setup for ppc (bnc#874466) +- 3.1.31 + +------------------------------------------------------------------- +Tue Apr 29 19:47:03 UTC 2014 - jreidinger(a)suse.com + +- fix reading of previous bootloader (bnc#874646) +- 3.1.30 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.29.tar.bz2 New: ---- yast2-bootloader-3.1.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.6bgmBk/_old 2014-05-06 13:40:42.000000000 +0200 +++ /var/tmp/diff_new_pack.6bgmBk/_new 2014-05-06 13:40:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.29 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.29.tar.bz2 -> yast2-bootloader-3.1.32.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/package/yast2-bootloader.changes new/yast2-bootloader-3.1.32/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.29/package/yast2-bootloader.changes 2014-04-22 11:18:41.000000000 +0200 +++ new/yast2-bootloader-3.1.32/package/yast2-bootloader.changes 2014-05-02 12:43:49.000000000 +0200 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Fri May 2 08:31:32 UTC 2014 - jreidinger(a)suse.com + +- fix activating partitions with number bigger then 4 on GPT disks + with legacy x86 boot (bnc#875757) +- 3.1.32 + +------------------------------------------------------------------- +Wed Apr 30 16:23:57 UTC 2014 - jreidinger(a)suse.com + +- handle diskless nfs setup for ppc (bnc#874466) +- 3.1.31 + +------------------------------------------------------------------- +Tue Apr 29 19:47:03 UTC 2014 - jreidinger(a)suse.com + +- fix reading of previous bootloader (bnc#874646) +- 3.1.30 + +------------------------------------------------------------------- Tue Apr 22 08:44:57 UTC 2014 - jreidinger(a)suse.com - Use correct check for partition setup for grub2 on s390 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/package/yast2-bootloader.spec new/yast2-bootloader-3.1.32/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.29/package/yast2-bootloader.spec 2014-04-22 11:18:41.000000000 +0200 +++ new/yast2-bootloader-3.1.32/package/yast2-bootloader.spec 2014-05-02 12:43:49.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.29 +Version: 3.1.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb new/yast2-bootloader-3.1.32/src/clients/bootloader_proposal.rb --- old/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb 2014-04-22 11:18:41.000000000 +0200 +++ new/yast2-bootloader-3.1.32/src/clients/bootloader_proposal.rb 2014-05-02 12:43:49.000000000 +0200 @@ -19,6 +19,7 @@ Yast.import "BootCommon" Yast.import "Bootloader" Yast.import "GfxMenu" + Yast.import "Installation" Yast.import "Storage" Yast.import "Mode" Yast.import "BootSupportCheck" @@ -54,7 +55,7 @@ end if Mode.update - if ["grub2", "grub2-efi"].include? Bootloader.getLoaderType + if ["grub2", "grub2-efi"].include? old_bootloader Builtins.y2milestone "update of grub2, do not repropose" Bootloader.blRead(true, true) else @@ -231,7 +232,25 @@ deep_copy(@ret) end - end + + private + BOOT_SYSCONFIG_PATH = "/etc/sysconfig/bootloader" + # read bootloader from /mnt as SCR is not yet switched in proposal + # phase of update (bnc#874646) + def old_bootloader + target_boot_sysconfig_path = ::File.join(Installation.destdir, BOOT_SYSCONFIG_PATH) + return nil unless ::File.exists? target_boot_sysconfig_path + + boot_sysconfig = ::File.read target_boot_sysconfig_path + old_bootloader = boot_sysconfig.lines.grep /^\s*LOADER_TYPE/ + Builtins.y2milestone "bootloader entry #{old_bootloader.inspect}" + retur nil if old_bootloader.empty? + + # get value from entry + old_bootloader.last.sub(/^.*=\s*(\S*).*/,"\\1").delete('"') + end + + end unless defined? Yast::BootloaderProposalClient end Yast::BootloaderProposalClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.32/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.29/src/include/bootloader/grub2/misc.rb 2014-04-22 11:18:41.000000000 +0200 +++ new/yast2-bootloader-3.1.32/src/include/bootloader/grub2/misc.rb 2014-05-02 12:43:49.000000000 +0200 @@ -102,44 +102,6 @@ mbr_dev = Ops.get_string(p_dev2, "disk", "") end end - # If loader_device is a disk device ("/dev/sda"), that means that we - # install the bootloader to the MBR. In this case, activate /boot - # partition. - # (partial fix of #20637) - # FIXME: necessity and purpose are unclear: if we install the - # bootloader to the MBR, then why do we need to activate the /boot - # partition? Stage1 of a GRUB has the first block of the stage2 - # hard-coded inside. - # This code was added because a /boot partition on a /dev/cciss device - # was not activated in bug #20637. Anyway, it probably never worked, - # since the bootloader was not installed to the MBR in that bug (and - # thus this code is not triggered). - # The real problem may have been that Storage::GetDiskPartition() did - # not know how to parse /dev/cciss/c0d0p1, so that the default case at - # the beginning of this function did not set up correct values. These - # days, Storage::GetDiskPartition() looks OK with /dev/cciss. - # Deactivated this code, so that "/boot" does not get activated - # unecessarily when GRUB stage1 is installed to the MBR anyway (this - # would unecessarily have broken drive C: detection on older MS - # operating systems). - # else if (num == 0) - # { - # p_dev = Storage::GetDiskPartition (boot_partition); - # num = BootCommon::myToInteger( p_dev["nr"]:nil ); - # mbr_dev = p_dev["disk"]:""; - # - # if (size (BootCommon::Md2Partitions (boot_partition)) > 1) - # { - # foreach (string k, integer v, BootCommon::Md2Partitions (boot_partition),{ - # if (search (k, loader_device) == 0) - # { - # p_dev = Storage::GetDiskPartition (k); - # num = BootCommon::myToInteger( p_dev["nr"]:nil ); - # mbr_dev = p_dev["disk"]:""; - # } - # }); - # } - # } # (bnc # 337742) - Unable to boot the openSUSE (32 and 64 bits) after installation # if loader_device is disk device activate BootStorage::BootPartitionDevice @@ -150,7 +112,7 @@ end if Ops.greater_than(num, 4) - Builtins.y2milestone("Bootloader partition type is logical") + Builtins.y2milestone("Bootloader partition type can be logical") tm = Storage.GetTargetMap partitions = Ops.get_list(tm, [mbr_dev, "partitions"], []) Builtins.foreach(partitions) do |p| @@ -469,50 +431,49 @@ Builtins.foreach(grub_getPartitionsToActivate) do |m_activate| num = Ops.get_integer(m_activate, "num", 0) mbr_dev = Ops.get_string(m_activate, "mbr", "") - if num != 0 && mbr_dev != "" - # if primary partition - if !Ops.is_integer?(num) || Ops.less_or_equal(num, 4) - Builtins.y2milestone("Activating partition %1 on %2", num, mbr_dev) - # FIXME: this is the most rotten code since molded sliced bread - # move to bootloader/Core/GRUB.pm or similar - # TESTME: make sure that parted does not destroy BSD - # slices (#suse24740): cf. section 5.1 of "info parted": - # Parted only supports the BSD disk label system. - # Parted is unlikely to support the partition slice - # system in the future because the semantics are rather - # strange, and don't work like "normal" partition tables - # do. - # FIXED: investigate proper handling of the activate flag - # (kernel ioctls in parted etc.) and fix parted - - # this is needed only on gpt disks but we run it always - # anyway; parted just fails, then - command = Builtins.sformat( - "/usr/sbin/parted -s %1 set %2 legacy_boot on", - mbr_dev, - num - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - WFM.Execute(path(".local.bash_output"), command) - ) - Builtins.y2milestone("Command output: %1", out) + raise "INTERNAL ERROR: Data for partition to activate is invalid." if num == 0 || mbr_dev.empty? - command = Builtins.sformat( - "/usr/sbin/parted -s %1 set %2 boot on", - mbr_dev, - num - ) - Builtins.y2milestone("Running command %1", command) - out = Convert.to_map( - WFM.Execute(path(".local.bash_output"), command) - ) - exit = Ops.get_integer(out, "exit", 0) - Builtins.y2milestone("Command output: %1", out) - ret = ret && 0 == exit - end - else - Builtins.y2error("Cannot activate %1", m_activate) + gpt_disk = Storage.GetTargetMap[BootCommon.mbrDisk]["label"] == "gpt" + # if primary partition on old DOS MBR table, GPT do not have such limit + if gpt_disk || num <= 4 + Builtins.y2milestone("Activating partition %1 on %2", num, mbr_dev) + # FIXME: this is the most rotten code since molded sliced bread + # move to bootloader/Core/GRUB.pm or similar + # TESTME: make sure that parted does not destroy BSD + # slices (#suse24740): cf. section 5.1 of "info parted": + # Parted only supports the BSD disk label system. + # Parted is unlikely to support the partition slice + # system in the future because the semantics are rather + # strange, and don't work like "normal" partition tables + # do. + # FIXED: investigate proper handling of the activate flag + # (kernel ioctls in parted etc.) and fix parted + + # this is needed only on gpt disks but we run it always + # anyway; parted just fails, then + command = Builtins.sformat( + "/usr/sbin/parted -s %1 set %2 legacy_boot on", + mbr_dev, + num + ) + Builtins.y2milestone("Running command %1", command) + out = Convert.to_map( + WFM.Execute(path(".local.bash_output"), command) + ) + Builtins.y2milestone("Command output: %1", out) + + command = Builtins.sformat( + "/usr/sbin/parted -s %1 set %2 boot on", + mbr_dev, + num + ) + Builtins.y2milestone("Running command %1", command) + out = Convert.to_map( + WFM.Execute(path(".local.bash_output"), command) + ) + exit = Ops.get_integer(out, "exit", 0) + Builtins.y2milestone("Command output: %1", out) + ret = ret && 0 == exit end end if activate ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.32/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.29/src/modules/BootGRUB2.rb 2014-04-22 11:18:41.000000000 +0200 +++ new/yast2-bootloader-3.1.32/src/modules/BootGRUB2.rb 2014-05-02 12:43:49.000000000 +0200 @@ -24,6 +24,7 @@ module Yast import "Arch" import "Storage" + import "BootCommon" class BootGRUB2Class < GRUB2Base def main @@ -118,9 +119,19 @@ grub_LocationProposal when /ppc/ partition = prep_partitions.first - raise "there is no prep partition" unless partition - - BootCommon.globals["boot_custom"] = partition + if partition + BootCommon.globals["boot_custom"] = partition + else + # handle diskless setup, in such case do not write boot code anywhere (bnc#874466) + # we need to detect what is mount on /boot and if it is nfs, then just + # skip this proposal. In other case if it is not nfs, then it is error and raise exception + BootCommon.DetectDisks + if BootCommon.getBootDisk == "/dev/nfs" + return + else + raise "there is no prep partition" + end + end when /s390/ Builtins.y2milestone "no partition needed for grub2 on s390" else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0