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# 892958 : "Unable to shutdown a Default System installed on iSCSI storage" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes 2014-09-19 17:44:32.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes 2014-09-23 18:20:25.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 23 15:03:15 UTC 2014 - mfilka@suse.com
+
+- bnc#892958
+ - propose STARTMODE=nfsroot when installing to remote device
+- 3.1.101
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-network
- at least 19 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old)
and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:44532 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-network-3.1.100.tar.bz2
New:
----
yast2-network-3.1.101.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.AxgLql/_old 2014-09-24 17:56:57.000000000 +0200
+++ /var/tmp/diff_new_pack.AxgLql/_new 2014-09-24 17:56:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.100
+Version: 3.1.101
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.1.100.tar.bz2 -> yast2-network-3.1.101.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/MAINTAINER new/yast2-network-3.1.101/MAINTAINER
--- old/yast2-network-3.1.100/MAINTAINER 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/MAINTAINER 2014-09-24 15:21:23.000000000 +0200
@@ -1 +1 @@
-Michal Filka
+Deprecated file. Use `osc maintainer yast2-network` instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/doc/files/dhcpcd-eth0.info new/yast2-network-3.1.101/doc/files/dhcpcd-eth0.info
--- old/yast2-network-3.1.100/doc/files/dhcpcd-eth0.info 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/doc/files/dhcpcd-eth0.info 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-IPADDR=10.20.1.3
-NETMASK=255.255.240.0
-NETWORK=10.20.0.0
-BROADCAST=10.20.15.255
-GATEWAY=10.20.0.1
-HOSTNAME='pegasus'
-DOMAIN='suse.cz'
-NISDOMAIN='suse.cz'
-DNS=10.20.16.1,10.20.0.2
-NISSERVERS=10.20.0.2
-DHCPSID=10.20.0.2
-DHCPGIADDR=0.0.0.0
-DHCPSIADDR=10.20.0.5
-DHCPCHADDR=00:A0:D2:2F:6C:36
-DHCPSHADDR=00:00:1C:B5:73:9B
-DHCPSNAME=''
-LEASETIME=172800
-RENEWALTIME=86400
-REBINDTIME=151200
-INTERFACE='eth0'
-CLASSID='Linux 2.4.20-4GB i586'
-CLIENTID=00:A0:D2:2F:6C:36
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/doc/files/install.inf new/yast2-network-3.1.101/doc/files/install.inf
--- old/yast2-network-3.1.100/doc/files/install.inf 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/doc/files/install.inf 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-Sourcemounted: 0
-Display: Color
-Alias: eth0 tulip
-Alias: eth1 tulip
-HasPCMCIA: 0
-InstMode: ftp
-NetConfig: dhcp
-Netdevice: eth0
-NetUniqueID: lgGW.+xOL8ZCSAQC
-IP: 10.20.1.29
-Hostname: 10.20.1.29
-Broadcast: 10.20.15.255
-Network: 10.20.0.0
-Netmask: 255.255.240.0
-Gateway: 10.20.0.1
-Nameserver: 10.20.0.2
-Server: 10.20.0.20
-Serverdir: /netboot/find/SuSE-9.0-Prof-i386-RC5-CD1
-Domain: suse.cz
-InitrdModules: cdrom scsi_mod sr_mod ide-cd
-Manual: 0
-Demo: 0
-Floppydisk: /dev/fd0
-UpdateDir: /linux/suse/i386-9.0
-YaST2update: 0
-Textmode: 0
-MemFree: 452000
-VNC: 0
-UseSSH: 0
-BootDisk: 0
-Disks: /dev/hda
-Cmdline: vga=0x31a splash=silent
-Keyboard: 1
-Framebuffer: 0x031a
-X11i:
-XServer: mga
-XVersion: 4
-XBusID: 1:0:0
-XkbRules: xfree86
-XkbModel: pc104
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/package/yast2-network.changes new/yast2-network-3.1.101/package/yast2-network.changes
--- old/yast2-network-3.1.100/package/yast2-network.changes 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/package/yast2-network.changes 2014-09-24 15:21:23.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Sep 23 15:03:15 UTC 2014 - mfilka@suse.com
+
+- bnc#892958
+ - propose STARTMODE=nfsroot when installing to remote device
+- 3.1.101
+
+-------------------------------------------------------------------
Wed Sep 17 16:35:12 CEST 2014 - mvidner@suse.com
- Really do not lose the default route
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/package/yast2-network.spec new/yast2-network-3.1.101/package/yast2-network.spec
--- old/yast2-network-3.1.100/package/yast2-network.spec 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/package/yast2-network.spec 2014-09-24 15:21:23.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.1.100
+Version: 3.1.101
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/src/clients/save_network.rb new/yast2-network-3.1.101/src/clients/save_network.rb
--- old/yast2-network-3.1.100/src/clients/save_network.rb 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/src/clients/save_network.rb 2014-09-24 15:21:23.000000000 +0200
@@ -47,6 +47,7 @@
Yast.import "Mode"
Yast.import "Arch"
Yast.import "LanUdevAuto"
+ Yast.import "Storage"
Yast.include self, "network/routines.rb"
Yast.include self, "network/complex.rb"
@@ -63,26 +64,22 @@
end
def adjust_for_network_disks(file)
- # known net devices: `nfs `iscsi `fcoe
- device = NetworkStorage.getDevice(Installation.destdir)
- network_disk = NetworkStorage.isDiskOnNetwork(device)
-
- log.info("Network based device: #{network_disk}")
-
- # overwrite configuration created during network setup e.g. in InstInstallInfClient
- if network_disk == :iscsi &&
- NetworkStorage.getiBFTDevices.include?(
- InstallInfConvertor::InstallInf["Netdevice"]
- )
- SCR.Execute(
- path(".target.bash"),
- "sed -i s/STARTMODE.*/STARTMODE='nfsroot'/ #{file}"
- )
- SCR.Execute(
- path(".target.bash"),
- "sed -i s/BOOTPROTO.*/BOOTPROTO='ibft'/ #{file}"
- )
- end
+ # Check if installation is targeted to a remote destination.
+ # Discover remote access method here - { :nfs, :iscsi, :fcoe }
+ # or :no when no remote storage
+ remote_access = Storage.IsDeviceOnNetwork(
+ NetworkStorage.getDevice(Installation.destdir)
+ )
+
+ log.info("Network based device: #{remote_access}")
+
+ return if remote_access == :no
+
+ # tune ifcfg file for remote filesystem
+ SCR.Execute(
+ path(".target.bash"),
+ "sed -i s/^[[:space:]]*STARTMODE=.*/STARTMODE='nfsroot'/ #{file}"
+ )
end
ETC = "/etc/"
@@ -215,14 +212,6 @@
new_SCR = WFM.SCROpen("chroot=/:scr", false)
WFM.SCRSetDefault(new_SCR)
- # when root is on nfs/iscsi set startmode=nfsroot #176804
- device = NetworkStorage.getDevice(Installation.destdir)
- Builtins.y2debug(
- "%1 directory is on %2 device",
- Installation.destdir,
- device
- )
-
# --------------------------------------------------------------
# Copy DHCP client cache so that we can request the same IP (#43974).
WFM.Execute(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/src/modules/LanItems.rb new/yast2-network-3.1.101/src/modules/LanItems.rb
--- old/yast2-network-3.1.100/src/modules/LanItems.rb 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/src/modules/LanItems.rb 2014-09-24 15:21:23.000000000 +0200
@@ -52,6 +52,7 @@
Yast.import "ProductFeatures"
Yast.import "NetworkConfig"
Yast.import "NetworkStorage"
+ Yast.import "Storage"
Yast.include self, "network/complex.rb"
Yast.include self, "network/routines.rb"
Yast.include self, "network/lan/s390.rb"
@@ -2351,7 +2352,7 @@
@netmask = ""
@bootproto = "dhcp"
# #176804
- if NetworkStorage.isDiskOnNetwork(NetworkStorage.getDevice("/")) != :no
+ if Storage.IsDeviceOnNetwork(NetworkStorage.getDevice("/")) != :no
@startmode = "nfsroot"
Builtins.y2milestone("startmode nfsroot")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.100/src/modules/NetworkStorage.rb new/yast2-network-3.1.101/src/modules/NetworkStorage.rb
--- old/yast2-network-3.1.100/src/modules/NetworkStorage.rb 2014-09-19 10:51:26.000000000 +0200
+++ new/yast2-network-3.1.101/src/modules/NetworkStorage.rb 2014-09-24 15:21:23.000000000 +0200
@@ -55,35 +55,7 @@
device
end
- # If the disk is on a networked device (NFS, ISCSI),
- # the main NIC needs STARTMODE nfsroot instead of auto.
- # @return root dev over network: `no `iscsi `nfs `fcoe
- def isDiskOnNetwork(device)
- Storage.IsDeviceOnNetwork(device)
- end
-
- def getiBFTDevices
- if SCR.Execute(path(".target.bash"), "ls /sys/firmware/ibft") == 0
- output = Convert.convert(
- SCR.Execute(
- path(".target.bash_output"),
- "ls /sys/firmware/ibft/ethernet*/device/net/"
- ),
- :from => "any",
- :to => "map "
- )
- ifaces = Builtins.filter(
- Builtins.splitstring(Ops.get_string(output, "stdout", ""), "\n")
- ) { |row| Ops.greater_than(Builtins.size(row), 0) }
- return deep_copy(ifaces)
- else
- return []
- end
- end
-
publish :function => :getDevice, :type => "string (string)"
- publish :function => :isDiskOnNetwork, :type => "symbol (string)"
- publish :function => :getiBFTDevices, :type => "list <string> ()"
end
NetworkStorage = NetworkStorageClass.new
continue with "q"...
Checked in at Wed Sep 24 17:57:37 CEST 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org