February 2014 - YaST Commits - openSUSE Mailing Lists

[yast-commit] Request 33454 changed to accepted (submit SUSE:SLE-12:GA/yast2-network)
by Ruediger Oertel 26 Feb '14

26 Feb '14

Visit https://build.suse.de/request/show/33454 State of request 33454 was changed by oertel: new -> accepted Comment: Accepted submit request 33454 from user leonardocf Actions: - submit Devel:YaST:Head/yast2-network => SUSE:SLE-12:GA/yast2-network -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12
by ro 26 Feb '14

26 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12 ## BNC# 859213 : "ethernet device not activated and configured during bootup" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-02-19 17:38:13.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-02-26 14:53:35.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Feb 26 13:19:08 UTC 2014 - mfilka(a)suse.com + +- bnc#859213 + - generate install.inf based netconfig at the begining of + installation. Generated configuration is copied to target at the + end of installation +- 3.1.24 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-network - at least 14 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old) and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:33454 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-network-3.1.23.tar.bz2 New: ---- yast2-network-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.xAhziv/_old 2014-02-26 16:43:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xAhziv/_new 2014-02-26 16:43:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.23.tar.bz2 -> yast2-network-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/package/yast2-network.changes new/yast2-network-3.1.24/package/yast2-network.changes --- old/yast2-network-3.1.23/package/yast2-network.changes 2014-02-19 16:35:11.000000000 +0100 +++ new/yast2-network-3.1.24/package/yast2-network.changes 2014-02-26 14:49:57.000000000 +0100 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Feb 26 13:19:08 UTC 2014 - mfilka(a)suse.com + +- bnc#859213 + - generate install.inf based netconfig at the begining of + installation. Generated configuration is copied to target at the + end of installation +- 3.1.24 + +------------------------------------------------------------------- Wed Feb 19 16:30:43 CET 2014 - snwint(a)suse.de - copy also ifroute-* files into installed system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/package/yast2-network.spec new/yast2-network-3.1.24/package/yast2-network.spec --- old/yast2-network-3.1.23/package/yast2-network.spec 2014-02-19 16:35:11.000000000 +0100 +++ new/yast2-network-3.1.24/package/yast2-network.spec 2014-02-26 14:49:57.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.23 +Version: 3.1.24 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/src/Makefile.am new/yast2-network-3.1.24/src/Makefile.am --- old/yast2-network-3.1.23/src/Makefile.am 2014-02-19 16:35:11.000000000 +0100 +++ new/yast2-network-3.1.24/src/Makefile.am 2014-02-26 14:49:57.000000000 +0100 @@ -109,7 +109,8 @@ ylibdir = @ylibdir@/network ylib_DATA = \ lib/network/edit_nic_name.rb \ - lib/network/confirm_virt_proposal.rb + lib/network/confirm_virt_proposal.rb \ + lib/network/install_inf_convertor.rb EXTRA_DIST = \ $(module_DATA) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/src/clients/inst_install_inf.rb new/yast2-network-3.1.24/src/clients/inst_install_inf.rb --- old/yast2-network-3.1.23/src/clients/inst_install_inf.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.24/src/clients/inst_install_inf.rb 2014-02-26 14:49:57.000000000 +0100 @@ -0,0 +1,16 @@ +require "yast" +require "network/install_inf_convertor" + +module Yast + + class InstInstallInfClient < Client + def main + InstallInfConvertor.instance.write_netconfig + + :next + end + end + +end + +Yast::InstInstallInfClient.new.main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/src/clients/save_network.rb new/yast2-network-3.1.24/src/clients/save_network.rb --- old/yast2-network-3.1.23/src/clients/save_network.rb 2014-02-19 16:35:11.000000000 +0100 +++ new/yast2-network-3.1.24/src/clients/save_network.rb 2014-02-26 14:49:57.000000000 +0100 @@ -28,6 +28,8 @@ # # module Yast + require "network/install_inf_convertor" + class SaveNetworkClient < Client def main Yast.import "UI" @@ -50,15 +52,6 @@ Yast.include self, "network/routines.rb" Yast.include self, "network/complex.rb" - @InstallInf = {} - - # global variable because chrooted environment - @network_disk = :no # `nfs `iscsi `fcoe - @netdevice = "" - - @hardware = ReadHardware("netcard") - Builtins.y2milestone("hardware %1", @hardware) - # for update system don't copy network from inst_sys (#325738) if !Mode.update save_network @@ -70,626 +63,27 @@ nil end - # Read one install.inf item - # @param [String] item InstallInf map key - # @param [String] var install.inf SCR variable - # @return true on success - def ReadInstallInfItem(install_inf, item, var) - return false if item == nil || item == "" || var == nil || var == "" - - val = Convert.to_string(SCR.Read(Builtins.add(install_inf, var))) - return false if val == nil - - Ops.set(@InstallInf, item, val) if val != "" - - true - end - - def DeleteFirstWord(s) - ret = Builtins.regexpsub(s, "^[^ ]* +(.*)", "\\1") - ret == nil ? s : ret - end - - # Read install.inf from the correct location - # @return true on success - def ReadInstallInf - Builtins.y2milestone("ReadInstallInf()") - - # Detect install.inf location - install_inf = nil - if Ops.greater_than(SCR.Read(path(".target.size"), "/etc/install.inf"), 0) - install_inf = path(".etc.install_inf") - Ops.set(@InstallInf, "installation", "yes") - else - # FIXME - # else if(SCR::Read(.target.size,"/var/lib/YaST2/install.inf") > 0) - # install_inf = .var.lib.YaST2.install_inf; - return false - end - - # Read install.inf items - ReadInstallInfItem(install_inf, "firststage_network", "ConfigureNetwork") - ReadInstallInfItem(install_inf, "ipaddr", "IP") - ReadInstallInfItem(install_inf, "ipaddr6", "IP6") - ReadInstallInfItem(install_inf, "netmask", "Netmask") - ReadInstallInfItem(install_inf, "bcast", "Broadcast") - ReadInstallInfItem(install_inf, "remote_ip", "Pointopoint") - ReadInstallInfItem(install_inf, "mtu", "IP_MTU") - ReadInstallInfItem(install_inf, "bootproto", "NetConfig") - ReadInstallInfItem(install_inf, "netdevice", "Netdevice") - ReadInstallInfItem(install_inf, "gateway", "Gateway") - ReadInstallInfItem(install_inf, "nameserver", "Nameserver") - ReadInstallInfItem(install_inf, "nameserver2", "Nameserver2") - ReadInstallInfItem(install_inf, "nameserver3", "Nameserver3") - ReadInstallInfItem(install_inf, "domain", "Domain") - ReadInstallInfItem(install_inf, "nisdomain", "NISDomain") - ReadInstallInfItem(install_inf, "hostname", "Hostname") - ReadInstallInfItem(install_inf, "module", "Alias") - ReadInstallInfItem(install_inf, "proxyUrl", "ProxyUrl") - ReadInstallInfItem(install_inf, "proxyProto", "ProxyProto") - # ReadInstallInfItem(install_inf, "options", "Options"); - # OSAHwAddr parameter s390 - ReadInstallInfItem(install_inf, "hwaddr", "HWAddr") - ReadInstallInfItem(install_inf, "ethtool_options", "ethtool") - ReadInstallInfItem(install_inf, "unique", "NetUniqueID") - ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait") - - ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2") - # ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); - ReadInstallInfItem(install_inf, "dhcptimeout", "DHCPTimeout") - - ReadInstallInfItem(install_inf, "WESSID", "WlanESSID") - ReadInstallInfItem(install_inf, "WAuth", "WlanAuth") - ReadInstallInfItem(install_inf, "WKey", "WlanKey") - ReadInstallInfItem(install_inf, "WkeyType", "WlanKeyType") - ReadInstallInfItem(install_inf, "WkeyLen", "WlanKeyLen") - - - # Split network device - @netdevice = Ops.get_string(@InstallInf, "netdevice", "") - Builtins.y2milestone("InstallInf::netdevice:%1", @netdevice) - if Mode.autoinst - # if possible, for temporary installation network use same device - # with same MAC address (even if devicename changed) (bnc#648270) - new_devname = LanUdevAuto.GetDevnameByMAC( - Ops.get_string(@InstallInf, "hwaddr", "") - ) - Builtins.y2milestone("LanUdevAuto::netdevice:%1", new_devname) - if Ops.greater_than(Builtins.size(new_devname), 0) - Builtins.y2milestone( - "old devname: %1, new devname: %2", - @netdevice, - new_devname - ) - @netdevice = new_devname - end - end - if @netdevice != "" - devtype = NetworkInterfaces.device_type(@netdevice) - Ops.set(@InstallInf, "type", devtype) if devtype != nil && devtype != "" - # InstallInf = remove(InstallInf, "netdevice"); - end - - if Arch.s390 - Builtins.y2milestone( - "Interface type: %1", - Ops.get_string(@InstallInf, "type", "") - ) - # only some card types need a persistent MAC (bnc#658708) - sysfs_id = dev_name_to_sysfs_id(@netdevice, @hardware) - if !s390_device_needs_persistent_mac(sysfs_id, @hardware) - @InstallInf = Builtins.remove(@InstallInf, "hwaddr") - end - # hsi devices do not support setting hwaddr (bnc #479481) - if Ops.get_string(@InstallInf, "type", "") == "hsi" && - Builtins.haskey(@InstallInf, "hwaddr") - @InstallInf = Builtins.remove(@InstallInf, "hwaddr") - end - # set HW address only for qeth set to Layer 2 (bnc #479481) - if Ops.get_string(@InstallInf, "type", "") == "eth" && - Ops.get_string(@InstallInf, "QETH_LAYER2_SUPPORT", "0") != "1" - @InstallInf = Builtins.remove(@InstallInf, "hwaddr") - end - end - - # Split FQ hostname - hostname = Ops.get_string(@InstallInf, "hostname", "") - if hostname != "" && !IP.Check(hostname) - split = Hostname.SplitFQ(hostname) - - # hostname is supposed to be FQDN (http://en.opensuse.org/Linuxrc) - # so we should not cut off domain name ... anyway remember domain, - # use it as fallback below, if there is no DNS search domain (#476208) - if Ops.greater_than(Builtins.size(split), 1) - Ops.set(@InstallInf, "fqdomain", Ops.get_string(split, 1, "")) - end - else - # do not have numeric hostname, #152218 - Ops.set(@InstallInf, "hostname", "") - end - - # #180821, todo cleanup - if @netdevice != "" - mod = Convert.to_string( - SCR.Read(Builtins.add(path(".etc.install_inf_alias"), @netdevice)) - ) - if mod != "" && mod != nil - Ops.set(@InstallInf, "module", mod) - options = Convert.to_string( - SCR.Read(Builtins.add(path(".etc.install_inf_options"), mod)) - ) - if options != "" && options != nil - Ops.set(@InstallInf, "options", options) - end - end - else - # FIXME: alias = eth0 tulip - # FIXME: options = ne io=0x200 - - # #42203: correctly parse module and options for proposal - # "eth0 qeth" -> "qeth" - # FIXME: this only works for a single module - mod = Ops.get_string(@InstallInf, "module", "") - Ops.set(@InstallInf, "module", DeleteFirstWord(mod)) if mod != "" - - options = Ops.get_string(@InstallInf, "options", "") - if options != "" - Ops.set(@InstallInf, "options", DeleteFirstWord(options)) - end - end - - Builtins.y2milestone("InstallInf(%1)", @InstallInf) - true - end - - - # Read module options from /etc/install.inf - # @param [String] module_name Module name - # @return module options, empty string if none - def InstallModuleOptions(module_name) - if Ops.greater_than(SCR.Read(path(".target.size"), "/etc/install.inf"), 0) - modules = SCR.Dir(path(".etc.install_inf_options")) - Builtins.y2milestone( - "Module with options in /etc/install.inf: %1", - modules - ) - if Builtins.contains(modules, module_name) - options = SCR.Read( - Builtins.add(path(".etc.install_inf_options"), module_name) - ) - return Convert.to_string(options) if options != nil && options != "" - end - end - "" - end - - def StdoutOf(command) - out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command)) - Ops.get_string(out, "stdout", "") - end - - def CreateIfcfg - ifcfg = "" - - if @network_disk == :iscsi && - Builtins.contains( - NetworkStorage.getiBFTDevices, - Ops.get_string(@InstallInf, "netdevice", "") - ) - ifcfg = Builtins.sformat( - "%1STARTMODE='nfsroot'\nBOOTPROTO='ibft'\n", - ifcfg - ) - else - # set BOOTPROTO=[ static | dhcp ] - if Ops.get_string(@InstallInf, "bootproto", "dhcp") == "static" - # add broadcast interface #suse49131 - ifcfg = Builtins.sformat( - "BOOTPROTO='static'\n" + - "IPADDR='%1/%2'\n" + - "BROADCAST='%3'\n", - Ops.get_string(@InstallInf, "ipaddr", ""), - Netmask.ToBits(Ops.get_string(@InstallInf, "netmask", "")), - Ops.get_string(@InstallInf, "bcast", "") - ) - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "ipaddr6", "")), - 0 - ) - ifcfg = Builtins.sformat( - "%1\n%2", - ifcfg, - Builtins.sformat( - "LABEL_ipv6='ipv6'\nIPADDR_ipv6='%1'\n", - Ops.get_string(@InstallInf, "ipaddr6", "") - ) - ) - end - else - #DHCP (also for IPv6) setup - if Ops.get_string(@InstallInf, "bootproto", "") == "dhcp" - ifcfg = "BOOTPROTO='dhcp4'\n" - elsif Ops.get_string(@InstallInf, "bootproto", "") == "dhcp6" - ifcfg = "BOOTPROTO='dhcp6'\n" - elsif Ops.get_string(@InstallInf, "bootproto", "") == "dhcp,dhcp6" - ifcfg = "BOOTPROTO='dhcp'\n" - end - - # set DHCP_SET_HOSTNAME=yes #suse30528 - Builtins.y2milestone( - "set DHCLIENT_SET_HOSTNAME=yes on installed system" - ) - SCR.Execute( - path(".target.bash_output"), - "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp" - ) - end - - if @network_disk == :no - ifcfg = Builtins.sformat("%1STARTMODE='onboot'\n", ifcfg) - else - ifcfg = Builtins.sformat("%1STARTMODE='nfsroot'\n", ifcfg) - end - end - - # wireless devices (bnc#223570) - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "WESSID", "")), - 0 - ) - ifcfg = Builtins.sformat( - "%1WIRELESS_ESSID='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "WESSID", "") - ) - - case Ops.get_string(@InstallInf, "WAuth", "") - when "", "psk" - ifcfg = Builtins.sformat( - "%1WIRELESS_WPA_PSK='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "WKey", "") - ) - ifcfg = Builtins.sformat("%1WIRELESS_AUTH_MODE='psk'\n", ifcfg) - when "open" - ifcfg = Builtins.sformat( - "%1WIRELESS_AUTH_MODE='no-encryption'\n", - ifcfg - ) - when "wep_open", "wep_restricted" - @type = "" - if Ops.get_string(@InstallInf, "WkeyType", "") == "password" - @type = "h:" - elsif Ops.get_string(@InstallInf, "WkeyType", "") == "ascii" - @type = "s:" - end - ifcfg = Builtins.sformat( - "%1WIRELESS_AUTH_MODE='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "WAuth", "") == "wep-open" ? "open" : "sharedkey" - ) - ifcfg = Builtins.sformat("%1WIRELESS_DEFAULT_KEY='0'\n", ifcfg) - ifcfg = Builtins.sformat( - "%1WIRELESS_KEY_0='%2%3'\n", - ifcfg, - @type, - Ops.get_string(@InstallInf, "WKey", "") - ) - ifcfg = Builtins.sformat( - "%1WIRELESS_KEY_LENGTH='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "WKeyLen", "") - ) - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "WKeyType", "")), - 0 - ) && - Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "WKey", "")), - 0 - ) - ifcfg = Builtins.sformat( - "%1WIRELESS_KEY_0='%2:%3'\n", - ifcfg, - Builtins.substring( - Ops.get_string(@InstallInf, "WKeyType", ""), - 0, - 1 - ), - Ops.get_string(@InstallInf, "WKey", "") - ) - end - end - end - - # if available, write MTU - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "mtu", "")), - 0 - ) - ifcfg = Builtins.sformat( - "%1MTU='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "mtu", "") - ) - end - - # for queth devices (s390) - # bnc#578689 - YaST2 should not write the MAC address into ifcfg file - if Arch.s390 && - Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "hwaddr", "")), - 0 - ) - ifcfg = Builtins.sformat( - "%1LLADDR='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "hwaddr", "") - ) - end - - # point to point interface - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "remote_ip", "")), - 0 - ) - ifcfg = Builtins.sformat( - "%1REMOTE_IPADDR='%2'\n", - ifcfg, - Ops.get_string(@InstallInf, "remote_ip", "") - ) - end - - new_netdevice = @netdevice - if !LanUdevAuto.AllowUdevModify - # bnc#821427: use same options as in /lib/udev/rules.d/71-biosdevname.rules - cmd = Builtins.sformat( - "biosdevname --policy physical --smbios 2.6 --nopirq -i %1", - @netdevice - ) - out = String.FirstChunk(StdoutOf(cmd), "\n") - if out != "" - Builtins.y2milestone("biosdevname renames %1 to %2", @netdevice, out) - new_netdevice = out - end - end - - ifcfg_name = Builtins.sformat("ifcfg-%1", new_netdevice) - - hw_name = BuildDescription( - NetworkInterfaces.device_type(@netdevice), - NetworkInterfaces.device_num(ifcfg_name), - { "dev_name" => @netdevice }, - @hardware - ) - # protect special characters, #305343 - if Ops.greater_than(Builtins.size(hw_name), 0) - ifcfg = Builtins.sformat("%1NAME='%2'\n", ifcfg, String.Quote(hw_name)) - end - - Builtins.y2milestone( - "Network Configuration:\n%1\nifcfg file: %2", - ifcfg, - ifcfg_name - ) - - # write only if file doesn't exists - dev_file = Builtins.sformat("/etc/sysconfig/network/%1", ifcfg_name) - - SCR.Write(path(".target.string"), dev_file, ifcfg) - Builtins.y2milestone("ifcfg file: %1", dev_file) - - nil - end - - # create all network files except ifcfg and hwcfg - # directly to installed system - - def CreateOtherNetworkFiles - # create hostname - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "hostname", "")), - 0 - ) - Builtins.y2milestone( - "Write HOSTNAME: %1", - Ops.get_string(@InstallInf, "hostname", "") - ) - SCR.Write( - path(".target.string"), - "/etc/HOSTNAME", - Ops.get_string(@InstallInf, "hostname", "") - ) - end - - if Ops.get_string(@InstallInf, "bootproto", "dhcp") == "static" - # create routes file - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "gateway", "")), - 0 - ) - Builtins.y2milestone( - "Writing route : %1", - Ops.get_string(@InstallInf, "gateway", "") - ) - SCR.Write( - path(".target.string"), - "/etc/sysconfig/network/routes", - Builtins.sformat( - "default %1 - -\n", - Ops.get_string(@InstallInf, "gateway", "") - ) - ) - elsif Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "remote_ip", "")), - 0 - ) - Builtins.y2milestone( - "Writing Peer-to-Peer route: %1", - Ops.get_string(@InstallInf, "remote_ip", "") - ) - SCR.Write( - path(".target.string"), - "/etc/sysconfig/network/routes", - Builtins.sformat( - "default %1 - -\n", - Ops.get_string(@InstallInf, "remote_ip", "") - ) - ) - else - Builtins.y2warning("No routing information in install.inf") - end - - # write DHCPTimeout linuxrc parameter as /etc/sysconfig/network/config.WAIT_FOR_INTERFACES (bnc#396824) - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "dhcptimeout", "")), - 0 - ) - SCR.Write( - path(".sysconfig.network.config.WAIT_FOR_INTERFACES"), - Ops.get_string(@InstallInf, "dhcptimeout", "") - ) - Builtins.y2milestone( - "Writing WAIT_FOR_INTERFACES=%1", - Ops.get_string(@InstallInf, "dhcptimeout", "") - ) - end - - - # create resolv.conf only for static configuration - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "nameserver", "")), - 0 - ) - serverlist = Ops.get_string(@InstallInf, "nameserver", "") - # write also secondary and third nameserver when available (bnc#446101) - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "nameserver2", "")), - 0 - ) - serverlist = Builtins.sformat( - "%1 %2", - serverlist, - Ops.get_string(@InstallInf, "nameserver2", "") - ) - end - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "nameserver3", "")), - 0 - ) - serverlist = Builtins.sformat( - "%1 %2", - serverlist, - Ops.get_string(@InstallInf, "nameserver3", "") - ) - end - #Do not write /etc/resolv.conf directly, feed the data to sysconfig instead, - #'netconfig' will do the job later on network startup (FaTE #303618) - SCR.Write( - path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS"), - serverlist - ) - Builtins.y2milestone( - "Writing static nameserver entry: %1", - Ops.get_string(@InstallInf, "nameserver", "") - ) - - #Enter search domain data only if present - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "domain", "")), - 0 - ) - SCR.Write( - path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST"), - Ops.get_string(@InstallInf, "domain", "") - ) - Builtins.y2milestone( - "Writing static searchlist entry: %1", - Ops.get_string(@InstallInf, "domain", "") - ) - elsif Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "fqdomain", "")), - 0 - ) - SCR.Write( - path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST"), - Ops.get_string(@InstallInf, "fqdomain", "") - ) - Builtins.y2milestone( - "No DNS search domain defined, using FQ domain name %1 as a fallback", - Ops.get_string(@InstallInf, "fqdomain", "") - ) - end - - #We're done. It is OK not to touch NETCONFIG_DNS_POLICY now as it is set to 'auto' by default - #and user did not have a chance to modify it up to now - SCR.Write(path(".sysconfig.network.config"), nil) - end - end - - # create proxy sysconfig file - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "proxyProto", "")), - 0 - ) && - Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "proxyUrl", "")), - 0 - ) - Builtins.y2milestone( - "Writing proxy settings: %1", - Ops.get_string(@InstallInf, "proxyUrl", "") - ) - - Proxy.Read - ex = Proxy.Export - - # bnc#693640 - update Proxy module's configuration - # username and password is stored in url because it is handled by linuxrc this way and it is impossible - # to distinguish how the user inserted it (separate or as a part of url?) - Ops.set( - ex, - Ops.add(Ops.get_string(@InstallInf, "proxyProto", ""), "_proxy"), - Ops.get_string(@InstallInf, "proxyUrl", "") - ) + def adjust_for_network_disks(file) + # known net devices: `nfs `iscsi `fcoe + device = NetworkStorage.getDevice(Installation.destdir) + network_disk = NetworkStorage.isDiskOnNetwork(device) - Proxy.Import(ex) - Proxy.Write + log.info("Network based device: #{network_disk}") - Builtins.y2debug("Written proxy settings: %1", ex) - end - # create defaultdomain - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "nisdomain", "")), - 0 - ) && - FileUtils.Exists("/etc/defaultdomain") - Builtins.y2milestone( - "Write defaultdomain: %1", - Ops.get_string(@InstallInf, "nisdomain", "") - ) - SCR.Write( - path(".target.string"), - "/etc/defaultdomain", - Ops.get_string(@InstallInf, "nisdomain", "") + # overwrite configuration created during network setup e.g. in InstInstallInfClient + if network_disk == :iscsi && + NetworkStorage.getiBFTDevices.include?( + InstallInfConvertor::InstallInf["Netdevice"] ) - end - - # write wait_for_interfaces if needed - if Ops.greater_than( - Builtins.size(Ops.get_string(@InstallInf, "connect_wait", "")), - 0 + SCR.Execute( + path(".target.bash"), + "sed -i s/STARTMODE.*/STARTMODE='nfsroot'/ #{file}" ) SCR.Execute( - path(".target.bash_output"), - Builtins.sformat( - "sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", - Ops.get_string(@InstallInf, "connect_wait", "") - ) + path(".target.bash"), + "sed -i s/BOOTPROTO.*/BOOTPROTO='ibft'/ #{file}" ) end - - nil end def CopyConfiguredNetworkFiles @@ -703,6 +97,10 @@ # just copy files Builtins.foreach(["ifcfg-*", "ifroute-*", "routes"]) do |file| + if file.include?("ifcfg-") + adjust_for_network_disks("#{sysconfig}/#{file}") + end + copy_from = String.Quote(Builtins.sformat("%1%2", sysconfig, file)) Builtins.y2milestone("Copy %1 into %2", copy_from, copy_to) cmd = Builtins.sformat("cp %1 %2", copy_from, copy_to) @@ -765,9 +163,6 @@ Installation.destdir, device ) - @network_disk = NetworkStorage.isDiskOnNetwork(device) - Builtins.y2milestone("Network based device: %1", @network_disk) - if Arch.s390 Builtins.y2milestone( @@ -854,11 +249,7 @@ Builtins.y2milestone("Not copying file %1 - it already exists", net_destfile) end - if ReadInstallInf() - CopyConfiguredNetworkFiles() - else - Builtins.y2error("Error while reading install.inf!") - end + CopyConfiguredNetworkFiles() # close and chroot back WFM.SCRSetDefault(old_SCR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/src/lib/network/install_inf_convertor.rb new/yast2-network-3.1.24/src/lib/network/install_inf_convertor.rb --- old/yast2-network-3.1.23/src/lib/network/install_inf_convertor.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.24/src/lib/network/install_inf_convertor.rb 2014-02-26 14:49:57.000000000 +0100 @@ -0,0 +1,403 @@ +require "yast" + +include Yast +include UIShortcuts +include I18n + +module Yast + + class InstallInfConvertor + include Singleton + include Logger + + BASH_PATH = Path.new(".target.bash") + + class InstallInf + INSTALL_INF = Path.new(".etc.install_inf") + + def self.[](item) + SCR.Read(INSTALL_INF + Path.new(".#{item}")).to_s + end + end + + def initialize + Yast.import "Hostname" + Yast.import "IP" + Yast.import "NetworkInterfaces" + Yast.import "FileUtils" + Yast.import "Netmask" + Yast.import "NetworkStorage" + Yast.import "Proxy" + Yast.import "Installation" + Yast.import "String" + Yast.import "Mode" + Yast.import "Arch" + Yast.import "LanUdevAuto" + + Yast.include self, "network/routines.rb" + Yast.include self, "network/complex.rb" + end + + def write_netconfig + write_ifcfg(create_ifcfg) + write_global_netconfig + end + + private + + def create_ifcfg + ifcfg = "" + + # set BOOTPROTO=[ static | dhcp ], linuxrc names it "NetConfig" + bootproto = InstallInf["NetConfig"] + case bootproto + when "static" + # add broadcast interface #suse49131 + ifcfg << "BOOTPROTO='static'\n" + ifcfg << "IPADDR='%s/%s'\n" % [ + InstallInf["IP"], + Netmask.ToBits(InstallInf["Netmask"]) + ] + ifcfg << "BROADCAST='%s'\n" % InstallInf["Broadcast"] + + ip6_addr = InstallInf["IP6"] + if !ip6_addr.empty? + ifcfg << "LABEL_ipv6='ipv6'\n" + ifcfg << "IPADDR_ipv6='#{ip6_addr}'\n" + end + + when "dhcp" + ifcfg << "BOOTPROTO='dhcp4'\n" + + when "dhcp6" + ifcfg << "BOOTPROTO='dhcp6'\n" + + when "dhcp,dhcp6" + ifcfg << "BOOTPROTO='dhcp'\n" + end + + # set DHCP_SET_HOSTNAME=yes #suse30528 + if bootproto =~ /dhcp/ + log.info("set DHCLIENT_SET_HOSTNAME=yes on installed system") + SCR.Execute( + BASH_PATH, + "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp" + ) + end + + ifcfg << "STARTMODE='onboot'\n" + + # wireless devices (bnc#223570) + ifcfg << create_wlan_ifcfg + + # if available, write MTU + mtu = InstallInf["IP_MTU"] + ifcfg << "MTU='#{mtu}'\n" if !mtu.empty? + + # for qeth devices (s390) + # bnc#578689 - YaST2 should not write the MAC address into ifcfg file + hardware = ReadHardware("netcard") + log.info("hardware: #{hardware}") + + ifcfg << create_s390_ifcfg(hardware) if Arch.s390 + + # point to point interface + remote_ip = InstallInf["Pointopoint"] + ifcfg << "REMOTE_IPADDR='#{remote_ip}'\n" if !remote_ip.empty? + + ifcfg << create_device_name_ifcfg(hardware) + + log.info("Network Configuration:\n#{ifcfg}") + + ifcfg + end + + # create all network files except ifcfg and hwcfg + # directly to installed system + def write_global_netconfig + # create hostname + write_hostname + + if InstallInf["NetConfig"] == "static" + write_gateway + + # write DHCPTimeout linuxrc parameter as /etc/sysconfig/network/config.WAIT_FOR_INTERFACES (bnc#396824) + write_dhcp_timeout + + # create resolv.conf only for static configuration + write_dns + end + + # create proxy sysconfig file + write_proxy + + # create defaultdomain + write_nis_domain + + # write wait_for_interfaces if needed + write_connect_wait + + nil + end + + def write_dhcp_timeout + dhcp_timeout = InstallInf["DHCPTimeout"].to_s + + return false if dhcp_timeout.empty? + + log.info("Writing WAIT_FOR_INTERFACES=#{dhcp_timeout}") + SCR.Write(path(".sysconfig.network.config.WAIT_FOR_INTERFACES"), dhcp_timeout) + end + + def write_gateway + gateway = InstallInf["Gateway"].to_s + ptp = InstallInf["Pointopoint"].to_s + + # create routes file + if !gateway.empty? + log.info("Writing route : #{gateway}") + return SCR.Write( + path(".target.string"), + "/etc/sysconfig/network/routes", + "default #{gateway} - -\n") + elsif !ptp.empty? + log.info("Writing Peer-to-Peer route: #{ptp}") + return SCR.Write( + path(".target.string"), + "/etc/sysconfig/network/routes", + "default #{ptp} - -\n" + ) + else + log.warn("No routing information in install.inf") + return false + end + end + + def hostname + hostname = InstallInf["Hostname"].to_s + + # do not have numeric hostname, #152218 + return "" if hostname.empty? || IP.Check(hostname) + return hostname + end + + def write_hostname + return false if hostname.empty? + + log.info("Write HOSTNAME: #{hostname}") + SCR.Write(path(".target.string"), "/etc/HOSTNAME", hostname) + end + + def write_dns + nameserver = InstallInf["Nameserver"].to_s + + return false if nameserver.empty? + + # hostname is supposed to be FQDN (http://en.opensuse.org/Linuxrc) + # remember domain, use it as fallback below, if there is no DNS search + # domain (#476208) + split = Hostname.SplitFQ(hostname) if !hostname.empty? && !IP.Check(hostname) + fqdomain = split[1] if split.size > 1 + + serverlist = nameserver + # write also secondary and third nameserver when available (bnc#446101) + nameserver2 = InstallInf["Nameserver2"].to_s + serverlist << " " << nameserver2 if !nameserver2.empty? + + nameserver3 = InstallInf["Nameserver3"].to_s + serverlist << " " << nameserver3 if !nameserver3.empty? + + # Do not write /etc/resolv.conf directly, feed the data to sysconfig instead, + # 'netconfig' will do the job later on network startup (FaTE #303618) + SCR.Write( + path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SERVERS"), + serverlist + ) + log.info("Writing static nameserver entry: #{nameserver}") + + # Enter search domain data only if present + domain = InstallInf["Domain"].to_s + if !domain.empty? + SCR.Write( + path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST"), + domain + ) + log.info("Writing static searchlist entry: #{domain}") + elsif !fqdomain.empty? + SCR.Write( + path(".sysconfig.network.config.NETCONFIG_DNS_STATIC_SEARCHLIST"), + fqdomain + ) + log.info("No DNS search domain defined, using FQ domain name #{fqdomain} as a fallback") + end + + #We're done. It is OK not to touch NETCONFIG_DNS_POLICY now as it is set to 'auto' by default + #and user did not have a chance to modify it up to now + SCR.Write(path(".sysconfig.network.config"), nil) + end + + def write_proxy + proxyUrl = InstallInf["ProxyUrl"].to_s + proxyProto = InstallInf["ProxyProto"].to_s + + return false if proxyProto.empty? || proxyUrl.empty? + + log.info("Writing proxy settings: #{proxyProto}_proxy = '#{proxyUrl}'") + + Proxy.Read + ex = Proxy.Export + + # bnc#693640 - update Proxy module's configuration + # username and password is stored in url because it is handled by linuxrc this way and it is impossible + # to distinguish how the user inserted it (separate or as a part of url?) + ex["#{proxyProto}_proxy"] = proxyUrl if ex + log.debug("Written proxy settings: #{ex}") + + Proxy.Import(ex) + Proxy.Write + end + + def write_nis_domain + nisdomain = InstallInf["NISDomain"].to_s + + return false if nisdomain.empty? || !FileUtils.Exists("/etc/defaultdomain") + + log.info("Write defaultdomain: #{nisdomain}") + SCR.Write(path(".target.string"), "/etc/defaultdomain", nisdomain) + end + + def write_connect_wait + connect_wait = InstallInf["ConnectWait"].to_s + + return false if connect_wait.empty? + + ret = SCR.Execute( + BASH_PATH, + "sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%s/g /etc/sysconfig/network/config" % connect_wait + ) + + return ret == 0 + end + + def dev_name + netdevice = InstallInf["Netdevice"].to_s + + if Mode.autoinst + # if possible, for temporary installation network use same device + # with same MAC address (even if devicename changed) (bnc#648270) + new_devname = LanUdevAuto.GetDevnameByMAC(InstallInf["HWAddr"]) + + netdevice = new_devname if !new_devname.empty? + end + + log.info("InstInstallInfClient#dev_name:#{netdevice}") + return netdevice + end + + def stdout_of(command) + SCR.Execute(path(".target.bash_output"), command)["stdout"].to_s + end + + def create_wlan_ifcfg + wlan_key = InstallInf["WlanKey"] + wlan_essid = InstallInf["WlanESSID"] + wlan_key_type = InstallInf["WlanKeyType"] + wlan_auth = InstallInf["WlanAuth"] + wlan_key_len = InstallInf["WlanKeyLen"] + + return "" if wlan_essid.empty? + + ifcfg = "WIRELESS_ESSID='#{wlan_essid}'\n" + + case wlan_auth + when "", "psk" + ifcfg << "WIRELESS_WPA_PSK='#{wlan_key}'\n" + ifcfg << "WIRELESS_AUTH_MODE='psk'\n" + + when "open" + ifcfg << "WIRELESS_AUTH_MODE='no-encryption'\n" + + when "wep_open", "wep_restricted" + if wlan_key_type == "password" + type = "h:" + elsif wlan_key_type == "ascii" + type = "s:" + else + type = wlan_key_type[0] + ":" + end + + auth_mode = wlan_auth == "wep-open" ? "open" : "sharedkey" + + ifcfg << "WIRELESS_AUTH_MODE='%s'\n" % wlan_auth_mode + ifcfg << "WIRELESS_DEFAULT_KEY='0'\n" + ifcfg << "WIRELESS_KEY_0='#{type}#{wlan_key}'\n" + ifcfg << "WIRELESS_KEY_LENGTH='#{wlan_key_len}'\n" + end + + return ifcfg + end + + def create_s390_ifcfg(hardware) + hwaddr = InstallInf["HWAddr"] + return "" if hwaddr.empty? + + netdevice = dev_name + return "" if netdevice.empty? + + devtype = NetworkInterfaces.GetType(netdevice) + + log.info("Interface type: #{devtype}") + + # only some card types need a persistent MAC (bnc#658708) + sysfs_id = dev_name_to_sysfs_id(netdevice, hardware) + return "" if !s390_device_needs_persistent_mac(sysfs_id, hardware) + + # hsi devices do not support setting hwaddr (bnc #479481) + return "" if devtype == "hsi" + + # set HW address only for qeth set to Layer 2 (bnc #479481) + return "" if devtype == "eth" && InstallInf["QETH_LAYER2_SUPPORT"] != "1" + + return "LLADDR='#{hwaddr}'\n" + end + + def create_device_name_ifcfg(hardware) + device_name = dev_name + + hw_name = BuildDescription( + NetworkInterfaces.device_type(device_name), + NetworkInterfaces.device_num(device_name), + { "dev_name" => device_name }, + hardware + ) + + return "" if hw_name.empty? + + # protect special characters, #305343 + return "NAME='%s'\n" % String.Quote(hw_name) + end + + def write_ifcfg(ifcfg) + device_name = dev_name + + return false if device_name.empty? + + if !LanUdevAuto.AllowUdevModify + # bnc#821427: use same options as in /lib/udev/rules.d/71-biosdevname.rules + cmd = "biosdevname --policy physical --smbios 2.6 --nopirq -i %s" % dev_name + out = String.FirstChunk(stdout_of(cmd), "\n") + if !out.empty? + device_name = out + log.info("biosdevname renames #{dev_name} to #{device_name}") + end + end + + dev_file = "/etc/sysconfig/network/ifcfg-#{device_name}" + + log.info("ifcfg file: #{dev_file}") + SCR.Write(path(".target.string"), dev_file, ifcfg) + end + + end + +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/test/Makefile.am new/yast2-network-3.1.24/test/Makefile.am --- old/yast2-network-3.1.23/test/Makefile.am 2014-02-19 16:35:11.000000000 +0100 +++ new/yast2-network-3.1.24/test/Makefile.am 2014-02-26 14:49:57.000000000 +0100 @@ -5,7 +5,8 @@ bridge_test.rb \ routing_test.rb \ new_device_startmode_test.rb \ - widgets_test.rb + widgets_test.rb \ + install_inf_convertor_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.23/test/install_inf_convertor_test.rb new/yast2-network-3.1.24/test/install_inf_convertor_test.rb --- old/yast2-network-3.1.23/test/install_inf_convertor_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.24/test/install_inf_convertor_test.rb 2014-02-26 14:49:57.000000000 +0100 @@ -0,0 +1,129 @@ +#!/usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" +require "network/install_inf_convertor" + +describe "InstallInfConvertor" do + + context "in case of no network config in /etc/install.inf" do + + before(:each) do + @install_inf_convertor = Yast::InstallInfConvertor.instance + + expect(Yast::InstallInfConvertor::InstallInf) + .to receive(:[]) + .at_least(:once) { nil } + end + + describe "#write_dhcp_timeout" do + it "returns false" do + expect(@install_inf_convertor.send(:write_dhcp_timeout)).to be_false + end + end + + describe "#hostname" do + it "returns empty string" do + expect(@install_inf_convertor.send(:hostname)).to be_empty + end + end + + describe "#write_hostname" do + it "returns false" do + expect(@install_inf_convertor.send(:write_hostname)).to be_false + end + end + + describe "#write_dns" do + it "returns false" do + expect(@install_inf_convertor.send(:write_dns)).to be_false + end + end + + describe "#write_proxy" do + it "returns false" do + expect(@install_inf_convertor.send(:write_proxy)).to be_false + end + end + + describe "#write_nis_domain" do + it "returns false" do + expect(@install_inf_convertor.send(:write_nis_domain)).to be_false + end + end + + describe "#write_connect_wait" do + it "returns false" do + expect(@install_inf_convertor.send(:write_connect_wait)).to be_false + end + end + + describe "#dev_name" do + it "returns empty string" do + expect(@install_inf_convertor.send(:dev_name)).to be_empty + end + + it "returns empty string even in autoinst mode" do + Yast.import "Mode" + Mode.stub(:autoinst) { true } + + expect(@install_inf_convertor.send(:dev_name)).to be_empty + end + end + + describe "#write_ifcfg" do + it "returns false when attempting to write nil content" do + expect(@install_inf_convertor.send(:write_ifcfg, nil)).to eql false + end + + it "returns false even when written content is not nil" do + expect(@install_inf_convertor.send(:write_ifcfg, "STARTMODE='onboot'\n")).to eql false + end + end + end + + context "linuxrc provides dhcp configuration" do + + DEVICE = "enp0s3" + NETCONFIG = "dhcp" + + before(:each) do + @install_inf_convertor = Yast::InstallInfConvertor.instance + + Yast::InstallInfConvertor::InstallInf + .stub(:[]) { "" } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("Netdevice") { DEVICE } + Yast::InstallInfConvertor::InstallInf + .stub(:[]) + .with("NetConfig") { NETCONFIG } + end + + describe "#dev_name" do + it "returns expected device name" do + expect(@install_inf_convertor.send(:dev_name)).to eql DEVICE + end + end + + describe "#write_ifcfg" do + it "creates ifcfg file for #{DEVICE}" do + expect(SCR) + .to receive(:Write) + .with(path(".target.string"), /.*-#{DEVICE}/, "") { true } + expect(@install_inf_convertor.send(:write_ifcfg, "")).to eql true + end + end + + describe "#create_ifcfg" do + it "creates a valid ifcfg for netconfig" do + expect(ifcfg = @install_inf_convertor.send(:create_ifcfg)).not_to be_empty + expect(ifcfg).to match /BOOTPROTO='dhcp4'/ + expect(ifcfg).to match /STARTMODE='onboot'/ + expect(ifcfg).to match /NAME='.*'/ + end + end + end + +end continue with "q"... Checked in at Wed Feb 26 16:43:25 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI yast2-installation -> sle12
by ro 26 Feb '14

26 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-installation -> sle12 ## BNC# 865575 : "License agreement dialog still contains "License Icon"" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-02-25 16:52:34.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-02-26 08:37:46.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 26 09:15:50 UTC 2014 - jreidinger(a)suse.com + +- implement cio ignore feature during installation for s390x + (FATE#315586) +- 3.1.44 + +------------------------------------------------------------------- +Tue Feb 25 16:11:08 CET 2014 - locilka(a)suse.com + +- Removed an icon from License Agreement dialog (bnc#865575) +- 3.1.43 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-installation - at least 18 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old) and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:33436 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit(a)opensuse.org" Old: ---- yast2-installation-3.1.42.tar.bz2 New: ---- yast2-installation-3.1.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.pl4hya/_old 2014-02-26 16:42:12.000000000 +0100 +++ /var/tmp/diff_new_pack.pl4hya/_new 2014-02-26 16:42:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.42 +Version: 3.1.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.42.tar.bz2 -> yast2-installation-3.1.44.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/package/yast2-installation.changes new/yast2-installation-3.1.44/package/yast2-installation.changes --- old/yast2-installation-3.1.42/package/yast2-installation.changes 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/package/yast2-installation.changes 2014-02-26 08:34:56.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Feb 26 09:15:50 UTC 2014 - jreidinger(a)suse.com + +- implement cio ignore feature during installation for s390x + (FATE#315586) +- 3.1.44 + +------------------------------------------------------------------- +Tue Feb 25 16:11:08 CET 2014 - locilka(a)suse.com + +- Removed an icon from License Agreement dialog (bnc#865575) +- 3.1.43 + +------------------------------------------------------------------- Tue Feb 25 14:14:59 CET 2014 - locilka(a)suse.com - Adapted ignored_features to handle possibly missing Cmdline entry diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/package/yast2-installation.spec new/yast2-installation-3.1.44/package/yast2-installation.spec --- old/yast2-installation-3.1.42/package/yast2-installation.spec 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/package/yast2-installation.spec 2014-02-26 08:34:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.42 +Version: 3.1.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/src/Makefile.am new/yast2-installation-3.1.44/src/Makefile.am --- old/yast2-installation-3.1.42/src/Makefile.am 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/src/Makefile.am 2014-02-26 08:34:56.000000000 +0100 @@ -8,6 +8,8 @@ modules/SystemFilesCopy.rb client_DATA = \ + clients/cio_ignore_finish.rb \ + clients/cio_ignore_proposal.rb \ clients/clone_proposal.rb \ clients/clone_finish.rb \ clients/copy_files_finish.rb \ @@ -103,7 +105,8 @@ ylibdir = "${yast2dir}/lib/installation" ylib_DATA = \ lib/installation/clone_settings.rb \ - lib/installation/minimal_installation.rb + lib/installation/minimal_installation.rb \ + lib/installation/cio_ignore.rb EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/src/clients/cio_ignore_finish.rb new/yast2-installation-3.1.44/src/clients/cio_ignore_finish.rb --- old/yast2-installation-3.1.42/src/clients/cio_ignore_finish.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.44/src/clients/cio_ignore_finish.rb 2014-02-26 08:34:56.000000000 +0100 @@ -0,0 +1,3 @@ +require "installation/cio_ignore" + +::Installation::CIOIgnoreFinish.new.run(*Yast::WFM.Args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/src/clients/cio_ignore_proposal.rb new/yast2-installation-3.1.44/src/clients/cio_ignore_proposal.rb --- old/yast2-installation-3.1.42/src/clients/cio_ignore_proposal.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.44/src/clients/cio_ignore_proposal.rb 2014-02-26 08:34:56.000000000 +0100 @@ -0,0 +1,3 @@ +require "installation/cio_ignore" + +::Installation::CIOIgnoreProposal.new.run(*Yast::WFM.Args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/src/clients/inst_complex_welcome.rb new/yast2-installation-3.1.44/src/clients/inst_complex_welcome.rb --- old/yast2-installation-3.1.42/src/clients/inst_complex_welcome.rb 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/src/clients/inst_complex_welcome.rb 2014-02-26 08:34:56.000000000 +0100 @@ -308,11 +308,8 @@ VSpacing(@text_mode ? 21 : 25), VBox( Left( - HBox( - Icon.Simple("yast-license"), - # TRANSLATORS: dialog caption - Heading(_("License Agreement")) - ) + # TRANSLATORS: dialog caption + Heading(_("License Agreement")) ), VSpacing(@text_mode ? 0.1 : 0.5), HSpacing(82), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/src/clients/inst_finish.rb new/yast2-installation-3.1.44/src/clients/inst_finish.rb --- old/yast2-installation-3.1.42/src/clients/inst_finish.rb 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/src/clients/inst_finish.rb 2014-02-26 08:34:56.000000000 +0100 @@ -150,6 +150,7 @@ "storage", "iscsi-client", "kernel", + "cio_ignore", "x11", "proxy", "pkg", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/src/lib/installation/cio_ignore.rb new/yast2-installation-3.1.44/src/lib/installation/cio_ignore.rb --- old/yast2-installation-3.1.42/src/lib/installation/cio_ignore.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.44/src/lib/installation/cio_ignore.rb 2014-02-26 08:34:56.000000000 +0100 @@ -0,0 +1,158 @@ +require "yast" + +module Installation + class CIOIgnore + include Singleton + attr_accessor :enabled + + def initialize + reset + end + + def reset + #default value requested in FATE#315586 + @enabled = true + end + end + + class CIOIgnoreProposal + include Yast::Logger + include Yast::I18n + + CIO_ENABLE_LINK = "cio_enable" + CIO_DISABLE_LINK = "cio_disable" + CIO_ACTION_ID = "cio" + + def initialize + textdomain "installation" + end + + def run(*args) + func = args.first + param = args[1] || {} + + log.debug "cio ignore proposal client called with #{func} and #{param}" + + case func + when "MakeProposal" + proposal_entry + when "Description" + { + # this is a heading + "rich_text_title" => _("Blacklist Devices"), + # this is a menu entry + "menu_title" => _("B&lacklist Devices"), + "id" => CIO_ACTION_ID + } + when "AskUser" + edit param["chosen_id"] + else + raise "Uknown action passed as first parameter" + end + end + + private + + def proposal_entry + Yast.import "HTML" + enabled = CIOIgnore.instance.enabled + + text = if enabled + # TRANSLATORS: Installation overview + # IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + (_( + "Blacklist devices enabled (<a href=\"%s\">disable</a>)." + ) % CIO_DISABLE_LINK) + else + # TRANSLATORS: Installation overview + # IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text + (_( + "Blacklist devices disabled (<a href=\"%1\">enable</a>)." + ) % CIO_ENABLE_LINK) + end + + { + "preformatted_proposal" => Yast::HTML.List([text]), + "links" => [CIO_ENABLE_LINK, CIO_DISABLE_LINK], + # TRANSLATORS: help text + "help" => _( + "<p>Use <b>Blacklist devices</b> if you want to create blacklist channels to such devices which will reduce kernel memory footprint.</p>" + ) + } + end + + def edit edit_id + raise "Internal error: no id passed to proposal edit" unless edit_id + + log.info "CIO proposal change requested, id #{edit_id}" + + cio_ignore = CIOIgnore.instance + + cio_ignore.enabled = case edit_id + when CIO_DISABLE_LINK then false + when CIO_ENABLE_LINK then true + when CIO_ACTION_ID then !cio_ignore.enabled + else + raise "INTERNAL ERROR: Unexpected value #{edit_id}" + end + + { "workflow_sequence" => :next } + end + end + + + class CIOIgnoreFinish + include Yast::Logger + include Yast::I18n + + USABLE_WORKFLOWS = [ + :installation, + :live_installation, + :autoinst + ] + + YAST_BASH_PATH = Yast::Path.new ".target.bash" + + + def initialize + textdomain "installation" + end + + def run(*args) + func = args.first + param = args[1] || {} + + log.debug "cio ignore finish client called with #{func} and #{param}" + + case func + when "Info" + Yast.import "Arch" + usable = Yast::Arch.s390() + + { + "steps" => 1, + # progress step title + "title" => _( + "Blacklisting Devices..." + ), + "when" => usable ? USABLE_WORKFLOWS : [] + } + + when "Write" + return nil unless CIOIgnore.instance.enabled + + res = Yast::SCR.Execute(YAST_BASH_PATH, "cio_ignore --unused --purge") + + log.info "result of cio_ignore call: #{res.inspect}" + + if res["exit"] != 0 + raise "cio_ignore command failed with stderr: #{res["stderr"]}" + end + + nil + else + raise "Uknown action passed as first parameter" + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/test/Makefile.am new/yast2-installation-3.1.44/test/Makefile.am --- old/yast2-installation-3.1.42/test/Makefile.am 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/test/Makefile.am 2014-02-26 08:34:56.000000000 +0100 @@ -1,5 +1,6 @@ TESTS = \ - inst_functions.rb + inst_functions_test.rb \ + cio_ignore_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/test/cio_ignore_test.rb new/yast2-installation-3.1.44/test/cio_ignore_test.rb --- old/yast2-installation-3.1.42/test/cio_ignore_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.44/test/cio_ignore_test.rb 2014-02-26 08:34:56.000000000 +0100 @@ -0,0 +1,148 @@ +#! /usr/bin/env rspec + +require_relative "./test_helper" + +require "installation/cio_ignore" + +describe ::Installation::CIOIgnoreProposal do + + subject { ::Installation::CIOIgnoreProposal.new } + + before(:each) do + ::Installation::CIOIgnore.instance.reset + end + + describe "#run" do + describe "first parameter \"MakeProposal\"" do + it "returns proposal entry hash containing \"links\", \"help\" and \"preformatted_proposal\"" do + result = subject.run("MakeProposal") + + expect(result).to have_key("links") + expect(result).to have_key("help") + expect(result).to have_key("preformatted_proposal") + end + end + + describe "first parameter \"Description\"" do + it "returns proposal metadata hash containing \"rich_text_title\", \"id\" and \"menu_title\"" do + result = subject.run("Description") + + expect(result).to have_key("rich_text_title") + expect(result).to have_key("menu_title") + expect(result).to have_key("id") + end + end + + describe "first parameter \"AskUser\"" do + it "changes proposal if passed with chosen_id in second param hash" do + params = [ + "AskUser", + "chosen_id" => ::Installation::CIOIgnoreProposal::CIO_DISABLE_LINK + ] + result = subject.run(*params) + + expect(result["workflow_sequence"]).to eq :next + expect(::Installation::CIOIgnore.instance.enabled).to be false + end + + it "raises RuntimeError if passed without chosen_id in second param hash" do + expect{subject.run("AskUser")}.to( + raise_error(RuntimeError) + ) + end + + it "raises RuntimeError if \"AskUser\" passed with non-existing chosen_id in second param hash" do + params = [ + "AskUser", + "chosen_id" => "non_existing" + ] + + expect{subject.run(*params)}.to raise_error(RuntimeError) + end + end + + it "raises RuntimeError if unknown action passed as first parameter" do + expect{subject.run("non_existing_action")}.to( + raise_error(RuntimeError) + ) + end + end +end + +describe ::Installation::CIOIgnoreFinish do + subject { ::Installation::CIOIgnoreFinish.new } + + describe "#run" do + describe "first paramater \"Info\"" do + it "returns info entry hash with empty \"when\" key for non s390x architectures" do + arch_mock = double("Yast::Arch", :s390 => false) + stub_const("Yast::Arch", arch_mock) + + result = subject.run("Info") + + expect(result["when"]).to be_empty + end + + it "returns info entry hash with scenarios in \"when\" key for s390x architectures" do + arch_mock = double("Yast::Arch", :s390 => true) + stub_const("Yast::Arch", arch_mock) + + result = subject.run("Info") + + expect(result["when"]).to_not be_empty + end + + end + + describe "first parameter \"Write\"" do + describe "Device blacklisting is disabled" do + it "do nothing" do + ::Installation::CIOIgnore.instance.enabled = false + + expect(Yast::SCR).to_not receive(:Execute) + + subject.run("Write") + end + end + + describe "Device blacklisting is enabled" do + + it "call `cio_ignore --unused --purge`" do + ::Installation::CIOIgnore.instance.enabled = true + + expect(Yast::SCR).to receive(:Execute). + with( + ::Installation::CIOIgnoreFinish::YAST_BASH_PATH, + "cio_ignore --unused --purge" + ). + once. + and_return({"exit" => 0, "stdout" => "", "stderr" => ""}) + + subject.run("Write") + end + + it "raises RuntimeError if cio_ignore call failed" do + ::Installation::CIOIgnore.instance.enabled = true + stderr = "HORRIBLE ERROR!!!" + + expect(Yast::SCR).to receive(:Execute). + with( + ::Installation::CIOIgnoreFinish::YAST_BASH_PATH, + "cio_ignore --unused --purge" + ). + once. + and_return({"exit" => 1, "stdout" => "", "stderr" => stderr}) + + expect{subject.run("Write")}.to raise_error(RuntimeError, /stderr/) + end + + end + end + + it "raises RuntimeError if unknown action passed as first parameter" do + expect{subject.run("non_existing_action")}.to( + raise_error(RuntimeError) + ) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/test/inst_functions.rb new/yast2-installation-3.1.44/test/inst_functions.rb --- old/yast2-installation-3.1.42/test/inst_functions.rb 2014-02-25 15:29:55.000000000 +0100 +++ new/yast2-installation-3.1.44/test/inst_functions.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,186 +0,0 @@ -#! /usr/bin/env rspec - -ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) - -require "yast" - -Yast.import "InstFunctions" - -# For mocking -Yast.import "Linuxrc" - -def stub_install_inf(install_inf) - Yast::Linuxrc.stub(:keys).and_return(install_inf.keys) - - install_inf.keys.each do |key| - Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key]) - end -end - -describe "when getting list of ignored features from Linuxrc" do - before(:each) do - Yast::InstFunctions.reset_ignored_features - end - - it "returns empty list if no features were ignored on commandline" do - linuxrc_commandline = "othercommand=xyz no_ignore_features=1 something-else=555" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to be_empty - end - - it "returns empty list if features ignored on commandline were empty" do - linuxrc_commandline = "ignore_features=" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to be_empty - end - - it "returns list of features set on commandline by two entries" do - linuxrc_commandline = "ignore_features=aa,b_b,c-c ignoredfeatures=a-a,dd othercommand=xyz" - ignored_features = ["aa", "bb", "cc", "dd"].sort - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features - end - - it "returns list of features set on commandline by one entry" do - linuxrc_commandline = "ignore_features=x-x,yy" - ignored_features = ["xx", "yy"].sort - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features - end - - it "returns list of features set on commandline by several entries, each feature in separate entry" do - linuxrc_commandline = "trash=install ignore_feature=f.e.a.ture1 ig.n.o.red_features=feature2 ignore_features=feature3" - ignored_features = ["feature1", "feature2", "feature3"].sort - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features - end - - it "returns one feature set on commandline by one entry" do - linuxrc_commandline = "i-g-n-o-r-e_feature=fff" - ignored_features = ["fff"] - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features - end - - it "returns one feature set on commandline by one entry using up/down case" do - linuxrc_commandline = "Ignore_FeaTUres=ffF" - ignored_features = ["fff"] - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features - end - - # PTOptions makes a command hidden from 'Cmdline' and creates - # a new install.inf entry using the exact name as it appears in PTOptions - # @see http://en.opensuse.org/SDB:Linuxrc#p_ptoptions - it "returns features set on commandline together with ptoptions" do - install_inf = { - 'ignored_features' => 'f1,f2,f3', - 'IgnoReDfEAtuRes' => 'f2,f4', - 'i.g.n.o.r.e.d.features' => 'f1,f5', - 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7', - 'another_feature' => 'another_value', - 'Cmdline' => 'splash=silent vga=0x314', - 'Keyboard' => '1', - } - stub_install_inf(install_inf) - - expect(Yast::InstFunctions.ignored_features.sort).to eq(['f1','f2','f3','f4','f5','f6','f7']) - end - - it "handles missing Cmdline in Linuxrc" do - install_inf = { - # Cmdline is not defined, bnc#861465 - 'Cmdline' => nil, - } - stub_install_inf(install_inf) - - expect(Yast::InstFunctions.ignored_features.sort).to be_empty - end -end - -describe "#feature_ignored?" do - before(:each) do - Yast::InstFunctions.reset_ignored_features - end - - it "should be true if feature is exactly set on commandline" do - linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.feature_ignored?("feature2")).to be_true - end - - it "should be true if feature is exactly on commandline using up/down case" do - linuxrc_commandline = "trash=install ignore_features=fEAture1 igno-RED_features=f-eatuRE_2 ignore_features=feature3" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e-2")).to be_true - end - - it "should be true if feature is set on commandline with dashes and underscores" do - linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e_2")).to be_true - end - - it "should be false if feature is not set on commandline" do - linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.feature_ignored?("no-such-feature")).to be_false - end - - it "should be false if feature to check is empty" do - linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.feature_ignored?("")).to be_false - end - - it "should be false if feature to check is undefined" do - linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" - - Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) - expect(Yast::InstFunctions.feature_ignored?(nil)).to be_false - end - - it "should be true if feature is mentioned as a separate install.inf entry or in Cmdline" do - install_inf = { - 'ignored_features' => 'f1,f2,f3', - 'IgnoReDfEAtuRes' => 'f2,f4', - 'i.g.n.o.r.e.d.features' => 'f1,f5', - 'IGNORED-FEA-T-U-RES' => 'f6,f7,f7,f7', - 'another_feature' => 'another_value', - 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8', - 'Keyboard' => '1', - } - stub_install_inf(install_inf) - - ['f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8'].each do |key| - expect(Yast::InstFunctions.feature_ignored?(key)).to be_true, "Key #{key} is not ignored" - end - end - - it "should be false if feature is not mentioned as a separate install.inf entry or in Cmdline" do - install_inf = { - 'ignored_features' => 'f1,f2,f3', - 'IgnoReDfEAtuRes' => 'f2,f4', - 'i.g.n.o.r.e.d.features' => 'f1,f5', - 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7', - 'another_feature' => 'another_value', - 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8', - 'Keyboard' => '1', - } - stub_install_inf(install_inf) - - expect(Yast::InstFunctions.feature_ignored?('f9')).to be_false - end -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/test/inst_functions_test.rb new/yast2-installation-3.1.44/test/inst_functions_test.rb --- old/yast2-installation-3.1.42/test/inst_functions_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.44/test/inst_functions_test.rb 2014-02-26 08:34:56.000000000 +0100 @@ -0,0 +1,184 @@ +#! /usr/bin/env rspec + +require_relative "./test_helper" + +Yast.import "InstFunctions" + +# For mocking +Yast.import "Linuxrc" + +def stub_install_inf(install_inf) + Yast::Linuxrc.stub(:keys).and_return(install_inf.keys) + + install_inf.keys.each do |key| + Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key]) + end +end + +describe "when getting list of ignored features from Linuxrc" do + before(:each) do + Yast::InstFunctions.reset_ignored_features + end + + it "returns empty list if no features were ignored on commandline" do + linuxrc_commandline = "othercommand=xyz no_ignore_features=1 something-else=555" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to be_empty + end + + it "returns empty list if features ignored on commandline were empty" do + linuxrc_commandline = "ignore_features=" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to be_empty + end + + it "returns list of features set on commandline by two entries" do + linuxrc_commandline = "ignore_features=aa,b_b,c-c ignoredfeatures=a-a,dd othercommand=xyz" + ignored_features = ["aa", "bb", "cc", "dd"].sort + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features + end + + it "returns list of features set on commandline by one entry" do + linuxrc_commandline = "ignore_features=x-x,yy" + ignored_features = ["xx", "yy"].sort + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features + end + + it "returns list of features set on commandline by several entries, each feature in separate entry" do + linuxrc_commandline = "trash=install ignore_feature=f.e.a.ture1 ig.n.o.red_features=feature2 ignore_features=feature3" + ignored_features = ["feature1", "feature2", "feature3"].sort + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features + end + + it "returns one feature set on commandline by one entry" do + linuxrc_commandline = "i-g-n-o-r-e_feature=fff" + ignored_features = ["fff"] + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features + end + + it "returns one feature set on commandline by one entry using up/down case" do + linuxrc_commandline = "Ignore_FeaTUres=ffF" + ignored_features = ["fff"] + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features + end + + # PTOptions makes a command hidden from 'Cmdline' and creates + # a new install.inf entry using the exact name as it appears in PTOptions + # @see http://en.opensuse.org/SDB:Linuxrc#p_ptoptions + it "returns features set on commandline together with ptoptions" do + install_inf = { + 'ignored_features' => 'f1,f2,f3', + 'IgnoReDfEAtuRes' => 'f2,f4', + 'i.g.n.o.r.e.d.features' => 'f1,f5', + 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7', + 'another_feature' => 'another_value', + 'Cmdline' => 'splash=silent vga=0x314', + 'Keyboard' => '1', + } + stub_install_inf(install_inf) + + expect(Yast::InstFunctions.ignored_features.sort).to eq(['f1','f2','f3','f4','f5','f6','f7']) + end + + it "handles missing Cmdline in Linuxrc" do + install_inf = { + # Cmdline is not defined, bnc#861465 + 'Cmdline' => nil, + } + stub_install_inf(install_inf) + + expect(Yast::InstFunctions.ignored_features.sort).to be_empty + end +end + +describe "#feature_ignored?" do + before(:each) do + Yast::InstFunctions.reset_ignored_features + end + + it "should be true if feature is exactly set on commandline" do + linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.feature_ignored?("feature2")).to be_true + end + + it "should be true if feature is exactly on commandline using up/down case" do + linuxrc_commandline = "trash=install ignore_features=fEAture1 igno-RED_features=f-eatuRE_2 ignore_features=feature3" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e-2")).to be_true + end + + it "should be true if feature is set on commandline with dashes and underscores" do + linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e_2")).to be_true + end + + it "should be false if feature is not set on commandline" do + linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.feature_ignored?("no-such-feature")).to be_false + end + + it "should be false if feature to check is empty" do + linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.feature_ignored?("")).to be_false + end + + it "should be false if feature to check is undefined" do + linuxrc_commandline = "trash=install ignore_features=feature1 ignored_features=feature2 ignore_features=feature3" + + Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) + expect(Yast::InstFunctions.feature_ignored?(nil)).to be_false + end + + it "should be true if feature is mentioned as a separate install.inf entry or in Cmdline" do + install_inf = { + 'ignored_features' => 'f1,f2,f3', + 'IgnoReDfEAtuRes' => 'f2,f4', + 'i.g.n.o.r.e.d.features' => 'f1,f5', + 'IGNORED-FEA-T-U-RES' => 'f6,f7,f7,f7', + 'another_feature' => 'another_value', + 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8', + 'Keyboard' => '1', + } + stub_install_inf(install_inf) + + ['f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8'].each do |key| + expect(Yast::InstFunctions.feature_ignored?(key)).to be_true, "Key #{key} is not ignored" + end + end + + it "should be false if feature is not mentioned as a separate install.inf entry or in Cmdline" do + install_inf = { + 'ignored_features' => 'f1,f2,f3', + 'IgnoReDfEAtuRes' => 'f2,f4', + 'i.g.n.o.r.e.d.features' => 'f1,f5', + 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7', + 'another_feature' => 'another_value', + 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8', + 'Keyboard' => '1', + } + stub_install_inf(install_inf) + + expect(Yast::InstFunctions.feature_ignored?('f9')).to be_false + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.42/test/test_helper.rb new/yast2-installation-3.1.44/test/test_helper.rb --- old/yast2-installation-3.1.42/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-3.1.44/test/test_helper.rb 2014-02-26 08:34:56.000000000 +0100 @@ -0,0 +1,8 @@ +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +if ENV["COVERAGE"] + require "simplecov" + SimpleCov.start +end + +require "yast" continue with "q"... Checked in at Wed Feb 26 16:42:57 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 33436 changed to accepted (submit SUSE:SLE-12:GA/yast2-installation)
by Ruediger Oertel 26 Feb '14

26 Feb '14

Visit https://build.suse.de/request/show/33436 State of request 33436 was changed by oertel: new -> accepted Comment: Accepted submit request 33436 from user licensedigger Actions: - submit Devel:YaST:Head/yast2-installation => SUSE:SLE-12:GA/yast2-installation -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 33440 changed to accepted (submit SUSE:SLE-12:GA/skelcd-control-SLES)
by Ruediger Oertel 26 Feb '14

26 Feb '14

Visit https://build.suse.de/request/show/33440 State of request 33440 was changed by oertel: new -> accepted Comment: Accepted submit request 33440 from user leonardocf Actions: - submit Devel:YaST:Head/skelcd-control-SLES => SUSE:SLE-12:GA/skelcd-control-SLES -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI skelcd-control-SLES -> sle12
by ro 26 Feb '14

26 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/skelcd-control-SLES -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLES/skelcd-control-SLES.changes 2014-02-20 14:50:49.000000000 +0100 +++ /mounts/work_src_done/SLE12/skelcd-control-SLES/skelcd-control-SLES.changes 2014-02-26 10:33:23.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 26 09:17:39 UTC 2014 - jreidinger(a)suse.com + +- add cio ignore proposal for s390 (FATE#315586) +- dependency on recent yast2-installation including cio ignore + proposal client +- 12.0.12 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - installation-images-SLES - skelcd-control-SLES - skelcd-control-SLES-for-VMware ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLES (Old) and /mounts/work_src_done/SLE12/skelcd-control-SLES (BS:build ID:33440 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-SLES", Maintainer is "yast-commit(a)opensuse.org" Old: ---- skelcd-control-SLES-12.0.11.tar.bz2 New: ---- skelcd-control-SLES-12.0.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-SLES.spec ++++++ --- /var/tmp/diff_new_pack.YyybhP/_old 2014-02-26 16:32:21.000000000 +0100 +++ /var/tmp/diff_new_pack.YyybhP/_new 2014-02-26 16:32:21.000000000 +0100 @@ -51,6 +51,7 @@ Requires: yast2-buildtools Requires: yast2-devtools Requires: yast2-fcoe-client +Requires: yast2-installation >= 3.1.44 Requires: yast2-iscsi-client Requires: yast2-kdump Requires: yast2-multipath @@ -81,7 +82,7 @@ Url: https://github.com/yast/skelcd-control-SLES AutoReqProv: off -Version: 12.0.11 +Version: 12.0.12 Release: 0 Summary: SLES control file needed for installation License: MIT ++++++ skelcd-control-SLES-12.0.11.tar.bz2 -> skelcd-control-SLES-12.0.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLES-12.0.11/control/control.SLES.xml new/skelcd-control-SLES-12.0.12/control/control.SLES.xml --- old/skelcd-control-SLES-12.0.11/control/control.SLES.xml 2014-02-20 14:25:06.000000000 +0100 +++ new/skelcd-control-SLES-12.0.12/control/control.SLES.xml 2014-02-26 10:31:31.000000000 +0100 @@ -289,6 +289,49 @@ </proposal> <proposal> + <archs>s390</archs> + <label>Installation Settings</label> + <mode>installation</mode> + <stage>initial</stage> + <name>initial</name> + <unique_id>inst_initial_s390</unique_id> + <enable_skip>no</enable_skip> + + <proposal_modules config:type="list"> + <proposal_module> + <name>cio_ignore</name> + <presentation_order>70</presentation_order> + </proposal_module> + <proposal_module> + <name>hwinfo</name> + <presentation_order>90</presentation_order> + </proposal_module> + <proposal_module> + <name>bootloader</name> + <presentation_order>40</presentation_order> + </proposal_module> + <proposal_module> + <name>kdump</name> + <presentation_order>60</presentation_order> + </proposal_module> +  + <proposal_module> + <name>software</name> + <presentation_order>35</presentation_order> + </proposal_module> +  + <proposal_module> + <name>default_target</name> + <presentation_order>75</presentation_order> + </proposal_module> + <proposal_module> + <name>firewall_stage1</name> + <presentation_order>50</presentation_order> + </proposal_module> + </proposal_modules> + </proposal> + + <proposal> <label>Installation Settings</label> <mode>autoinstallation</mode> <stage>initial</stage> @@ -442,6 +485,7 @@ <proposal_module>packages</proposal_module> <proposal_module>backup</proposal_module> <proposal_module>language</proposal_module> + <proposal_module>cio_ignore</proposal_module> </proposal_modules> </proposal> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLES-12.0.11/package/skelcd-control-SLES.changes new/skelcd-control-SLES-12.0.12/package/skelcd-control-SLES.changes --- old/skelcd-control-SLES-12.0.11/package/skelcd-control-SLES.changes 2014-02-20 14:25:06.000000000 +0100 +++ new/skelcd-control-SLES-12.0.12/package/skelcd-control-SLES.changes 2014-02-26 10:31:31.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 26 09:17:39 UTC 2014 - jreidinger(a)suse.com + +- add cio ignore proposal for s390 (FATE#315586) +- dependency on recent yast2-installation including cio ignore + proposal client +- 12.0.12 + +------------------------------------------------------------------- Thu Feb 20 12:51:47 UTC 2014 - jreidinger(a)suse.com - remove suseconfig script from autoyast work-flow as it no longer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLES-12.0.11/package/skelcd-control-SLES.spec new/skelcd-control-SLES-12.0.12/package/skelcd-control-SLES.spec --- old/skelcd-control-SLES-12.0.11/package/skelcd-control-SLES.spec 2014-02-20 14:25:06.000000000 +0100 +++ new/skelcd-control-SLES-12.0.12/package/skelcd-control-SLES.spec 2014-02-26 10:31:31.000000000 +0100 @@ -51,6 +51,7 @@ Requires: yast2-buildtools Requires: yast2-devtools Requires: yast2-fcoe-client +Requires: yast2-installation >= 3.1.44 Requires: yast2-iscsi-client Requires: yast2-kdump Requires: yast2-multipath @@ -81,7 +82,7 @@ Url: https://github.com/yast/skelcd-control-SLES AutoReqProv: off -Version: 12.0.11 +Version: 12.0.12 Release: 0 Summary: SLES control file needed for installation License: MIT continue with "q"... Checked in at Wed Feb 26 16:34:27 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 33442 changed to accepted (submit SUSE:SLE-12:GA/skelcd-control-SLED)
by Ruediger Oertel 26 Feb '14

26 Feb '14

Visit https://build.suse.de/request/show/33442 State of request 33442 was changed by oertel: new -> accepted Comment: Accepted submit request 33442 from user licensedigger Actions: - submit Devel:YaST:Head/skelcd-control-SLED => SUSE:SLE-12:GA/skelcd-control-SLED -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI skelcd-control-SLED -> sle12
by ro 26 Feb '14

26 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/skelcd-control-SLED -> sle12 ## BNC# 864860 : "inst_suseconfig fails in yast during installation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLED/skelcd-control-SLED.changes 2014-01-31 15:55:50.000000000 +0100 +++ /mounts/work_src_done/SLE12/skelcd-control-SLED/skelcd-control-SLED.changes 2014-02-26 11:06:30.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 20 13:37:03 UTC 2014 - jreidinger(a)suse.com + +- remove suseconfig script from autoyast work-flow as it no longer + exists (BNC#864860) +- 12.0.7 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - skelcd-control-SLED ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/skelcd-control-SLED (Old) and /mounts/work_src_done/SLE12/skelcd-control-SLED (BS:build ID:33442 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-SLED", Maintainer is "yast-commit(a)opensuse.org" Old: ---- skelcd-control-SLED-12.0.6.tar.bz2 New: ---- skelcd-control-SLED-12.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-SLED.spec ++++++ --- /var/tmp/diff_new_pack.Y51siO/_old 2014-02-26 16:31:59.000000000 +0100 +++ /var/tmp/diff_new_pack.Y51siO/_new 2014-02-26 16:31:59.000000000 +0100 @@ -82,7 +82,7 @@ Url: https://github.com/yast/skelcd-control-SLED AutoReqProv: off -Version: 12.0.6 +Version: 12.0.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 ++++++ skelcd-control-SLED-12.0.6.tar.bz2 -> skelcd-control-SLED-12.0.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLED-12.0.6/control/control.SLED.xml new/skelcd-control-SLED-12.0.7/control/control.SLED.xml --- old/skelcd-control-SLED-12.0.6/control/control.SLED.xml 2014-01-31 13:55:47.000000000 +0100 +++ new/skelcd-control-SLED-12.0.7/control/control.SLED.xml 2014-02-26 11:04:58.000000000 +0100 @@ -833,9 +833,6 @@ <name>restore_settings</name> </module> <module> - <name>suseconfig</name> - </module> - <module> <label>Release Notes</label> <name>release_notes</name> <enable_back>yes</enable_back> @@ -1022,9 +1019,6 @@ <label>System Configuration</label> <name>autoconfigure</name> </module> - <module> - <name>suseconfig</name> - </module> </modules> </workflow> @@ -1054,10 +1048,6 @@ <label>System Configuration</label> <name>autoconfigure</name> </module> - <module> - <label>Clean Up</label> - <name>suseconfig</name> - </module> </modules> </workflow> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLED-12.0.6/package/skelcd-control-SLED.changes new/skelcd-control-SLED-12.0.7/package/skelcd-control-SLED.changes --- old/skelcd-control-SLED-12.0.6/package/skelcd-control-SLED.changes 2014-01-31 13:55:47.000000000 +0100 +++ new/skelcd-control-SLED-12.0.7/package/skelcd-control-SLED.changes 2014-02-26 11:04:58.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 20 13:37:03 UTC 2014 - jreidinger(a)suse.com + +- remove suseconfig script from autoyast work-flow as it no longer + exists (BNC#864860) +- 12.0.7 + +------------------------------------------------------------------- Fri Jan 31 12:47:02 UTC 2014 - lslezak(a)suse.cz - fixed some dependencies (BuildRequires -> Requires) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-SLED-12.0.6/package/skelcd-control-SLED.spec new/skelcd-control-SLED-12.0.7/package/skelcd-control-SLED.spec --- old/skelcd-control-SLED-12.0.6/package/skelcd-control-SLED.spec 2014-01-31 13:55:47.000000000 +0100 +++ new/skelcd-control-SLED-12.0.7/package/skelcd-control-SLED.spec 2014-02-26 11:04:58.000000000 +0100 @@ -82,7 +82,7 @@ Url: https://github.com/yast/skelcd-control-SLED AutoReqProv: off -Version: 12.0.6 +Version: 12.0.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 continue with "q"... Checked in at Wed Feb 26 16:32:16 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] Request 33453 changed to accepted (submit SUSE:SLE-12:GA/autoyast2)
by Ruediger Oertel 26 Feb '14

26 Feb '14

Visit https://build.suse.de/request/show/33453 State of request 33453 was changed by oertel: new -> accepted Comment: Accepted submit request 33453 from user licensedigger Actions: - submit Devel:YaST:Head/autoyast2 => SUSE:SLE-12:GA/autoyast2 -- Configure notifications at https://build.suse.de/user/notifications SUSE Internal OBS Instance (https://build.suse.de/) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] [ci_new_pac] JFYI autoyast2 -> sle12
by ro 26 Feb '14

26 Feb '14

Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/autoyast2 -> sle12 ## BNC# 864421 : "Calling the YaST module 'inst_oes_preconfig has failed." (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/autoyast2/autoyast2.changes 2014-02-17 17:43:22.000000000 +0100 +++ /mounts/work_src_done/SLE12/autoyast2/autoyast2.changes 2014-02-26 14:37:41.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 26 13:25:45 CET 2014 - fehr(a)suse.de + +- Cloning of software section clones only patterns in state + "visible", this is a problem with OES where pattern + novell-yast2 is not a visible pattern (bnc#864421), changed so + that all patterns are written into cloned patterns list +- add %{yast_controldir} as directory to package +- 3.1.18 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - autoyast2 - yast2-product-creator ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/autoyast2 (Old) and /mounts/work_src_done/SLE12/autoyast2 (BS:build ID:33453 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2", Maintainer is "yast-commit(a)opensuse.org" Old: ---- autoyast2-3.1.17.tar.bz2 New: ---- autoyast2-3.1.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.f4m2p0/_old 2014-02-26 16:15:40.000000000 +0100 +++ /var/tmp/diff_new_pack.f4m2p0/_new 2014-02-26 16:15:40.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -226,6 +226,7 @@ %{yast_yncludedir}/autoinstall/tree.rb %{yast_yncludedir}/autoinstall/types.rb +%dir %{yast_controldir} %{yast_controldir}/*.xml %{yast_moduledir}/AutoInstall.rb ++++++ autoyast2-3.1.17.tar.bz2 -> autoyast2-3.1.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.17/package/autoyast2.changes new/autoyast2-3.1.18/package/autoyast2.changes --- old/autoyast2-3.1.17/package/autoyast2.changes 2014-02-17 14:16:04.000000000 +0100 +++ new/autoyast2-3.1.18/package/autoyast2.changes 2014-02-26 14:34:54.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Feb 26 13:25:45 CET 2014 - fehr(a)suse.de + +- Cloning of software section clones only patterns in state + "visible", this is a problem with OES where pattern + novell-yast2 is not a visible pattern (bnc#864421), changed so + that all patterns are written into cloned patterns list +- add %{yast_controldir} as directory to package +- 3.1.18 + +------------------------------------------------------------------- Mon Feb 17 13:37:55 CET 2014 - fehr(a)suse.de - Remove call to inst_suseconfig from control_continue_autoyast.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.17/package/autoyast2.spec new/autoyast2-3.1.18/package/autoyast2.spec --- old/autoyast2-3.1.17/package/autoyast2.spec 2014-02-17 14:16:04.000000000 +0100 +++ new/autoyast2-3.1.18/package/autoyast2.spec 2014-02-26 14:34:54.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -226,6 +226,7 @@ %{yast_yncludedir}/autoinstall/tree.rb %{yast_yncludedir}/autoinstall/types.rb +%dir %{yast_controldir} %{yast_controldir}/*.xml %{yast_moduledir}/AutoInstall.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.17/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.18/src/modules/AutoinstSoftware.rb --- old/autoyast2-3.1.17/src/modules/AutoinstSoftware.rb 2014-02-17 14:16:04.000000000 +0100 +++ new/autoyast2-3.1.18/src/modules/AutoinstSoftware.rb 2014-02-26 14:34:54.000000000 +0100 @@ -954,7 +954,6 @@ all_patterns = Pkg.ResolvableProperties("", :pattern, "") @all_xpatterns = Pkg.ResolvableDependencies("", :pattern, "") patterns = [] - visible_patterns = [] patternsFullData = Builtins.filter(all_patterns) do |p| ret2 = false @@ -965,12 +964,6 @@ Ops.get_string(p, "name", "no name") ) ret2 = true - if Ops.get_boolean(p, "user_visible", true) == true - visible_patterns = Builtins.add( - visible_patterns, - Ops.get_string(p, "name", "no name") - ) - end end ret2 end @@ -1069,7 +1062,7 @@ !Builtins.regexpmatch(pkg, "kernel-.*") || pkg == "kernel-uml" end) ) - Ops.set(software, "patterns", Builtins.sort(visible_patterns)) + Ops.set(software, "patterns", Builtins.sort(patterns)) Ops.set(software, "remove-packages", Builtins.toset(removepackages)) deep_copy(software) end continue with "q"... Checked in at Wed Feb 26 16:16:30 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0