Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-10-18 13:27:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-10-10 17:30:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-10-18 13:27:51.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Oct 15 19:11:39 UTC 2016 - [email protected] + +- Network: Added method to adapt old configuration of enslaved + interfaces. (bsc#962824) +- 3.2.1 + +------------------------------------------------------------------- +Thu Oct 13 14:11:31 UTC 2016 - [email protected] + +- Set installer theme when Screenmode is specified at boot time + (related to bsc#780621) +- 3.2.0 + +------------------------------------------------------------------- Old: ---- yast2-3.1.208.tar.bz2 New: ---- yast2-3.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.qhraie/_old 2016-10-18 13:27:52.000000000 +0200 +++ /var/tmp/diff_new_pack.qhraie/_new 2016-10-18 13:27:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.208 +Version: 3.2.1 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 ++++++ yast2-3.1.208.tar.bz2 -> yast2-3.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/library/network/src/modules/NetworkInterfaces.rb new/yast2-3.2.1/library/network/src/modules/NetworkInterfaces.rb --- old/yast2-3.1.208/library/network/src/modules/NetworkInterfaces.rb 2016-09-28 13:42:59.000000000 +0200 +++ new/yast2-3.2.1/library/network/src/modules/NetworkInterfaces.rb 2016-10-17 11:05:31.000000000 +0200 @@ -758,6 +758,29 @@ filter_interfacetype(config) end + # Adapts the interface configuration used during many year for enslaved + # interfaces (IPADDR == 0.0.0.0 and BOOTPROTO == 'static'). + # + # Sets the BOOTPROTO as none, empties the IPADDR, and also empties the + # NETMASK and the PREFIXLEN if exist. + def adapt_old_config! + @Devices.each do |devtype, devices| + devices.each do |device, config| + bootproto = config["BOOTPROTO"] || "static" + next unless bootproto == "static" && config["IPADDR"] == "0.0.0.0" + + config["BOOTPROTO"] = "none" + config["IPADDR"] = "" + config["NETMASK"] = "" if config.key? "NETMASK" + config["PREFIXLEN"] = "" if config.key? "PREFIXLEN" + + @Devices[devtype][device] = config + end + end + + @Devices + end + # The device is added to @Devices[devtype] hash using the device name as key # and the ifconfg hash as value # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/library/network/test/data/etc/sysconfig/network/ifcfg-br1 new/yast2-3.2.1/library/network/test/data/etc/sysconfig/network/ifcfg-br1 --- old/yast2-3.1.208/library/network/test/data/etc/sysconfig/network/ifcfg-br1 2016-09-28 13:42:59.000000000 +0200 +++ new/yast2-3.2.1/library/network/test/data/etc/sysconfig/network/ifcfg-br1 2016-10-17 11:05:31.000000000 +0200 @@ -1,5 +1,6 @@ DEVICE=br1 BRIDGE=yes +BRIDGE_PORTS=eth2 IPADDR=10.0.0.1 NETMASK=255.255.255.0 ONBOOT=yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/library/network/test/data/etc/sysconfig/network/ifcfg-eth2 new/yast2-3.2.1/library/network/test/data/etc/sysconfig/network/ifcfg-eth2 --- old/yast2-3.1.208/library/network/test/data/etc/sysconfig/network/ifcfg-eth2 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.2.1/library/network/test/data/etc/sysconfig/network/ifcfg-eth2 2016-10-17 11:05:31.000000000 +0200 @@ -0,0 +1,5 @@ +DEVICE=eth2 +BOOTPROTO='static' +IPADDR='0.0.0.0/32' +STARTMODE='auto' +SLAVE=YES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/library/network/test/network_interfaces_test.rb new/yast2-3.2.1/library/network/test/network_interfaces_test.rb --- old/yast2-3.1.208/library/network/test/network_interfaces_test.rb 2016-09-28 13:42:59.000000000 +0200 +++ new/yast2-3.2.1/library/network/test/network_interfaces_test.rb 2016-10-17 11:05:31.000000000 +0200 @@ -32,7 +32,7 @@ describe "#Read" do let(:data_dir) { File.join(File.dirname(__FILE__), "data") } # Defined in test/data/etc/sysconfig/ifcfg-* - let(:devices) { ["arc5", "bond0", "br1", "em1", "eth0", "eth1", "ppp0", "vlan3"] } + let(:devices) { ["arc5", "bond0", "br1", "em1", "eth0", "eth1", "eth2", "ppp0", "vlan3"] } around do |example| change_scr_root(data_dir, &example) @@ -58,6 +58,34 @@ expect(subject.GetIP("eth0")).to eql(["192.168.0.200", "192.168.20.100"]) expect(subject.GetValue("eth0", "NETMASK")).to eql("255.255.255.0") end + + end + + describe "adapt_old_config!" do + let(:data_dir) { File.join(File.dirname(__FILE__), "data") } + # Defined in test/data/etc/sysconfig/ifcfg-* + let(:devices) { ["arc5", "bond0", "br1", "em1", "eth0", "eth1", "eth2", "ppp0", "vlan3"] } + + around do |example| + change_scr_root(data_dir, &example) + end + + before do + subject.main + end + + it "converts old enslaved interfaces config" do + subject.Read + expect(subject.GetValue("eth2", "IPADDR")).to eql("0.0.0.0") + subject.adapt_old_config! + + expect(subject.GetValue("eth0", "IPADDR")).to eql("192.168.0.200") + expect(subject.GetValue("eth2", "NETMASK")).to eql("") + expect(subject.GetValue("eth2", "PREFIXLEN")).to eql("") + expect(subject.GetValue("eth2", "IPADDR")).to eql("") + expect(subject.GetValue("eth2", "BOOTPROTO")).to eql("none") + end + end describe "#FilterDevices" do @@ -199,7 +227,7 @@ end it "returns an array of devices which have got given key,value" do - expect(subject.Locate("BOOTPROTO", "static")).to eql(["bond0", "em1", "eth0", "eth1"]) + expect(subject.Locate("BOOTPROTO", "static")).to eql(["bond0", "em1", "eth0", "eth1", "eth2"]) expect(subject.Locate("BONDING_MASTER", "YES")).to eql(["bond0"]) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/package/yast2.changes new/yast2-3.2.1/package/yast2.changes --- old/yast2-3.1.208/package/yast2.changes 2016-09-28 13:43:00.000000000 +0200 +++ new/yast2-3.2.1/package/yast2.changes 2016-10-17 11:05:31.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Sat Oct 15 19:11:39 UTC 2016 - [email protected] + +- Network: Added method to adapt old configuration of enslaved + interfaces. (bsc#962824) +- 3.2.1 + +------------------------------------------------------------------- +Thu Oct 13 14:11:31 UTC 2016 - [email protected] + +- Set installer theme when Screenmode is specified at boot time + (related to bsc#780621) +- 3.2.0 + +------------------------------------------------------------------- Wed Sep 28 13:28:21 CEST 2016 - [email protected] - save_y2logs: use canonical path (bsc#1001454) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/package/yast2.spec new/yast2-3.2.1/package/yast2.spec --- old/yast2-3.1.208/package/yast2.spec 2016-09-28 13:43:00.000000000 +0200 +++ new/yast2-3.2.1/package/yast2.spec 2016-10-17 11:05:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.208 +Version: 3.2.1 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.208/scripts/yast2-funcs new/yast2-3.2.1/scripts/yast2-funcs --- old/yast2-3.1.208/scripts/yast2-funcs 2016-09-28 13:43:00.000000000 +0200 +++ new/yast2-3.2.1/scripts/yast2-funcs 2016-10-17 11:05:31.000000000 +0200 @@ -132,6 +132,10 @@ export XCURSOR_THEME="DMZ" export Y2STYLE="installation.qss" export QT_HOME_DIR="/tmp/.qt/" + if [ "$Screenmode" != "" ] && [ "$Screenmode" != "default" ]; then + export Y2ALTSTYLE="$Screenmode" + fi + mkdir -p /tmp/.qt [ -e /usr/share/desktop-data/qtrc ] && cp /usr/share/desktop-data/qtrc /tmp/.qt/ set_qt_arabic_workaround @@ -155,6 +159,14 @@ : } +function set_inst_ncurses_env() +{ + if [ "$Screenmode" != "" ] && [ "$Screenmode" != "default" ];then + # Use 'highcontrast' as the only alternative screenmode. + export Y2NCURSES_COLOR_THEME="highcontrast" + fi +} + ### Local Variables: *** ### mode: shell-script ***
