Hello community, here is the log from the commit of package yast2-dhcp-server for openSUSE:Factory checked in at 2016-02-26 22:18:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dhcp-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-dhcp-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dhcp-server/yast2-dhcp-server.changes 2016-01-16 11:57:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-dhcp-server.new/yast2-dhcp-server.changes 2016-02-26 22:18:38.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 26 13:14:57 UTC 2016 - [email protected] + +- Fix "One or more selected network interfaces is not configured" + when ifconfig is not installed (boo#958525). +- 3.1.10 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-3.1.9.tar.bz2 New: ---- yast2-dhcp-server-3.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.mpYfTf/_old 2016-02-26 22:18:39.000000000 +0100 +++ /var/tmp/diff_new_pack.mpYfTf/_new 2016-02-26 22:18:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-dhcp-server-3.1.9.tar.bz2 -> yast2-dhcp-server-3.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/package/yast2-dhcp-server.changes new/yast2-dhcp-server-3.1.10/package/yast2-dhcp-server.changes --- old/yast2-dhcp-server-3.1.9/package/yast2-dhcp-server.changes 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/package/yast2-dhcp-server.changes 2016-02-25 16:22:30.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 26 13:14:57 UTC 2016 - [email protected] + +- Fix "One or more selected network interfaces is not configured" + when ifconfig is not installed (boo#958525). +- 3.1.10 + +------------------------------------------------------------------- Thu Jan 14 15:46:22 UTC 2016 - [email protected] - Fix validation of AutoYaST profiles (bsc#954412) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/package/yast2-dhcp-server.spec new/yast2-dhcp-server-3.1.10/package/yast2-dhcp-server.spec --- old/yast2-dhcp-server-3.1.9/package/yast2-dhcp-server.spec 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/package/yast2-dhcp-server.spec 2016-02-25 16:22:30.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-dhcp-server -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/commandline.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/commandline.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/commandline.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/commandline.rb 2016-02-25 16:22:30.000000000 +0100 @@ -133,12 +133,6 @@ ), "type" => "string" }, - "list" => { - # command line help text for an option - "help" => _( - "List all defined hosts with a fixed address" - ) - }, "select" => { # command line help text for an option "help" => _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/dialogs.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/dialogs.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/dialogs.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/dialogs.rb 2016-02-25 16:22:30.000000000 +0100 @@ -300,7 +300,6 @@ Wizard.RestoreAbortButton return CWM.Run(w, @functions) - :back end # Run group dialog @@ -369,7 +368,6 @@ Wizard.RestoreAbortButton return CWM.Run(w, @functions) - :back end # Run shared network dialog @@ -382,9 +380,9 @@ while par_id != "" parents = Builtins.add(parents, par_type) - p = DhcpServer.GetEntryParent(par_type, par_id) - par_type = Ops.get(p, "type", "") - par_id = Ops.get(p, "id", "") + par = DhcpServer.GetEntryParent(par_type, par_id) + par_type = Ops.get(par, "type", "") + par_id = Ops.get(par, "id", "") end possible = ["subnet", "host", "shared-network", "group", "pool", "class"] if Builtins.contains(parents, "class") || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/dialogs2.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/dialogs2.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/dialogs2.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/dialogs2.rb 2016-02-25 16:22:30.000000000 +0100 @@ -380,8 +380,6 @@ end def seconds2time(seconds) - unit = "seconds" - count = seconds if Ops.modulo(seconds, 60 * 60 * 24) == 0 return { "unit" => "days", @@ -942,9 +940,6 @@ timeserver = Convert.to_string(UI.QueryWidget(Id("timeserver"), :Value)) printserver = Convert.to_string(UI.QueryWidget(Id("printserver"), :Value)) winsserver = Convert.to_string(UI.QueryWidget(Id("winsserver"), :Value)) - defaultleasetime = Convert.to_string( - UI.QueryWidget(Id("defaultleasetime"), :Value) - ) # FIXME: it is not defined which of values must be filled (must be lease time defined?) # shouldn't be lease time controlled for too small or too big value? @@ -1491,12 +1486,6 @@ event = deep_copy(event) from_ip = Convert.to_string(UI.QueryWidget(Id("from_ip"), :Value)) to_ip = Convert.to_string(UI.QueryWidget(Id("to_ip"), :Value)) - defaultleasetime = Convert.to_string( - UI.QueryWidget(Id("defaultleasetime"), :Value) - ) - maxleasetime = Convert.to_string( - UI.QueryWidget(Id("maxleasetime"), :Value) - ) if from_ip == "" && to_ip == "" # disable dynamic IP assigning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/dns-server-management.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/dns-server-management.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/dns-server-management.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/dns-server-management.rb 2016-02-25 16:22:30.000000000 +0100 @@ -102,7 +102,6 @@ zone_counter = -1 zone_found = false - filtered_zone = {} Builtins.foreach(all_zones) do |one_zone| zone_counter = Ops.add(zone_counter, 1) if Ops.get(one_zone, "zone") == zone_name @@ -629,7 +628,6 @@ return nil end - ret = nil all_records = DnsServer.FetchZones zone_counter = -1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/helps.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/helps.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/helps.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/helps.rb 2016-02-25 16:22:30.000000000 +0100 @@ -223,12 +223,6 @@ "To enter the complete configuration of the DHCP server, click\n" + "<b>DHCP Server Expert Configuration</b>.</p>" ), - # help text 1/2 - "interfaces" => _( - "<p><b><big>Network Interfaces</big></b><br>\n" + - "Select the network interfaces to which the DHCP server should listen from\n" + - "<b>Available Interfaces</b>.</p>" - ), # host management help 1/3 "host_management" => _( "<p><b><big>Host Management</big></b><br>\nUse this dialog to edit hosts with static address binding.</p>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/options.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/options.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/options.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/options.rb 2016-02-25 16:22:30.000000000 +0100 @@ -159,7 +159,6 @@ "pid-file-name" => "name", "ping-check" => "onoff", "ping-timeout" => "seconds", - "ping-timeout" => "seconds", "server-identifier" => "hostname", "server-name" => "name", "site-option-space" => "name", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/wizards.rb new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/wizards.rb --- old/yast2-dhcp-server-3.1.9/src/include/dhcp-server/wizards.rb 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/include/dhcp-server/wizards.rb 2016-02-25 16:22:30.000000000 +0100 @@ -63,8 +63,7 @@ "section_type_select" => [lambda { SelectEditationDialog() }, true], "store" => [lambda { SectionStore() }, true], "tsig_keys" => lambda { RunTsigKeysDialog(false) }, - "tsig_keys_1" => lambda { RunTsigKeysDialog(true) }, - "commonsetup" => lambda { CommonConfigDialog() } + "tsig_keys_1" => lambda { RunTsigKeysDialog(true) } } sequence = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dhcp-server-3.1.9/src/modules/DhcpServer.pm new/yast2-dhcp-server-3.1.10/src/modules/DhcpServer.pm --- old/yast2-dhcp-server-3.1.9/src/modules/DhcpServer.pm 2016-01-14 23:22:11.000000000 +0100 +++ new/yast2-dhcp-server-3.1.10/src/modules/DhcpServer.pm 2016-02-25 16:22:30.000000000 +0100 @@ -2267,27 +2267,29 @@ #} #my $iface = $out{"stdout"}; + # sample output: + # 9: virbr0 inet 192.168.122.1/24 brd 192.168.122.255 scope global virbr0\ valid_lft forever preferred_lft forever my %out = %{SCR->Execute (".target.bash_output", - "LANG=en_EN /sbin/ifconfig $interface") || {}}; + "LANG=C ip -4 -oneline addr show dev $interface") || {}}; if ($out{"exit"} != 0) { - y2error ("ifconfig exited with code $out{\"exit\"}"); + y2error ("'ip addr' exited with code $out{\"exit\"}"); return {}; } my @lines = split /\n/, $out{"stdout"}; - @lines = grep /inet addr:.*Bcast:.*Mask:.*/, @lines; + @lines = grep /inet .* brd .*/, @lines; my $line = $lines[0] || ""; - if ($line =~ /inet addr:[ \t]*([0-9\.]+)[ \t]*Bcast:[ \t]*([0-9\.]+)[ \t]*Mask:[ \t]*([0-9\.]+)[ \t]*$/) + if ($line =~ /inet[ \t]*([0-9\.]+)\/([0-9\.]+)[ \t]*brd[ \t]*([0-9\.]+)/) { $ip = $1; - $bcast = $2; - $netmask = $3; + $netmask = Netmask->FromBits($2); + $bcast = $3; } - else + else { chomp($interface); - y2warning ("ifconfig didn't return meaningful data about $interface, asking NetworkInterfaces"); + y2warning ("'ip addr' didn't return meaningful data about $interface, asking NetworkInterfaces"); $ip = NetworkInterfaces->GetValue($interface, "IPADDR"); $bcast = NetworkInterfaces->GetValue($interface, "BROADCAST"); $netmask = NetworkInterfaces->GetValue($interface, "NETMASK");
