Mailinglist Archive: yast-commit (1271 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2-packager -> sle12
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-packager ->
sle12



## BNC# 873180 : "installation onto nfsroot does not honour nfs mount options"
(RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes
2014-08-18 16:30:21.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes
2014-09-02 09:29:34.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 1 14:16:27 UTC 2014 - ancor@xxxxxxxx
+
+- Use options from partitioner during test mount (bnc#873180)
+- 3.1.43
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-packager
- at least 29 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-packager (Old)
and /mounts/work_src_done/SLE12/yast2-packager (BS:build ID:43348
MAIL:yast-commit@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-packager-3.1.42.tar.bz2

New:
----
yast2-packager-3.1.43.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.IwnetP/_old 2014-09-02 15:57:34.000000000 +0200
+++ /var/tmp/diff_new_pack.IwnetP/_new 2014-09-02 15:57:34.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-packager
-Version: 3.1.42
+Version: 3.1.43
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build

++++++ yast2-packager-3.1.42.tar.bz2 -> yast2-packager-3.1.43.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.42/package/yast2-packager.changes
new/yast2-packager-3.1.43/package/yast2-packager.changes
--- old/yast2-packager-3.1.42/package/yast2-packager.changes 2014-08-18
16:14:49.000000000 +0200
+++ new/yast2-packager-3.1.43/package/yast2-packager.changes 2014-09-02
09:24:22.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 1 14:16:27 UTC 2014 - ancor@xxxxxxxx
+
+- Use options from partitioner during test mount (bnc#873180)
+- 3.1.43
+
+-------------------------------------------------------------------
Mon Aug 18 12:57:01 UTC 2014 - lslezak@xxxxxxx

- fixed adding of new SLP and CD/DVD repositories
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.42/package/yast2-packager.spec
new/yast2-packager-3.1.43/package/yast2-packager.spec
--- old/yast2-packager-3.1.42/package/yast2-packager.spec 2014-08-18
16:14:49.000000000 +0200
+++ new/yast2-packager-3.1.43/package/yast2-packager.spec 2014-09-02
09:24:22.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-packager
-Version: 3.1.42
+Version: 3.1.43
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-3.1.42/src/modules/SpaceCalculation.rb
new/yast2-packager-3.1.43/src/modules/SpaceCalculation.rb
--- old/yast2-packager-3.1.42/src/modules/SpaceCalculation.rb 2014-08-18
16:14:50.000000000 +0200
+++ new/yast2-packager-3.1.43/src/modules/SpaceCalculation.rb 2014-09-02
09:24:23.000000000 +0200
@@ -662,8 +662,11 @@
Builtins.sformat("test -d %1 || mkdir -p %1", tmpdir)
)

+ # mount options determined by partitioner
+ mount_options = (part["fstopt"] || "").split(",")
+
# mount in read-only mode (safer)
- mount_options = ["ro"]
+ mount_options << "ro"

# add "nolock" if it's a NFS share (bnc#433893)
if used_fs == :nfs
@@ -672,7 +675,7 @@
end

# join the options
- mount_options_str = Builtins.mergestring(mount_options, ",")
+ mount_options_str = mount_options.uniq.join(",")

mount_command = Builtins.sformat(
"/bin/mount -o %1 %2 %3",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.42/test/Makefile.am
new/yast2-packager-3.1.43/test/Makefile.am
--- old/yast2-packager-3.1.42/test/Makefile.am 2014-08-18 16:14:50.000000000
+0200
+++ new/yast2-packager-3.1.43/test/Makefile.am 2014-09-02 09:24:23.000000000
+0200
@@ -1,6 +1,7 @@
TESTS = \
addon_product_test.rb \
- packages_test.rb
+ packages_test.rb \
+ space_calculation_test.rb

TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.42/test/data/nfs_target_map.yml
new/yast2-packager-3.1.43/test/data/nfs_target_map.yml
--- old/yast2-packager-3.1.42/test/data/nfs_target_map.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-packager-3.1.43/test/data/nfs_target_map.yml 2014-09-02
09:24:23.000000000 +0200
@@ -0,0 +1,81 @@
+---
+"/dev/nfs":
+ device: "/dev/nfs"
+ name: nfs
+ partitions:
+ - detected_fs: :nfs
+ device: nfs-host:/nfsroot
+ fstopt: noatime,nfsvers=3,nolock
+ fstype: NFS
+ inactive: true
+ mount: "/"
+ mountby: :device
+ name: nfs-host:/nfsroot
+ size_k: 528336896
+ type: :nfs
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :nfs
+ type: :CT_NFS
+ used_by_device: ''
+ used_by_type: :UB_NONE
+"/dev/sda":
+ bus: SCSI
+ cyl_count: 913
+ cyl_size: 8225280
+ device: "/dev/sda"
+ driver: hv_storvsc
+ driver_module: hv_storvsc
+ label: msdos
+ max_logical: 255
+ max_primary: 4
+ model: Virtual Disk
+ name: sda
+ partitions:
+ - detected_fs: :swap
+ device: "/dev/sda1"
+ fsid: 130
+ fstype: Linux swap
+ name: sda1
+ nr: 1
+ region:
+ - 0
+ - 17
+ size_k: 128000
+ type: :primary
+ udev_id:
+ - scsi-14d53465420202020f0b629d55569424d87c45d5d487ba648-part1
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :swap
+ uuid: 650ac9f8-affc-4951-8c71-494d1606fb56
+ - boot: true
+ detected_fs: :ext4
+ device: "/dev/sda2"
+ fsid: 131
+ fstype: Linux native
+ label: ar_sl12-dev
+ name: sda2
+ nr: 2
+ region:
+ - 126
+ - 787
+ size_k: 6313984
+ type: :primary
+ udev_id:
+ - scsi-14d53465420202020f0b629d55569424d87c45d5d487ba648-part2
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :ext4
+ uuid: 9fe51394-d7de-470c-b176-10996fd09a43
+ proposal_name: 1. SCSI Disk, 7.00 GiB, /dev/sda, Msft-Virtual Disk
+ sector_size: 512
+ size_k: 7340032
+ transport: :unknown
+ type: :CT_DISK
+ udev_id:
+ - scsi-14d53465420202020f0b629d55569424d87c45d5d487ba648
+ unique: R7kM.3NysQ6jC4p5
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ vendor: Msft
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.42/test/data/xfs_target_map.yml
new/yast2-packager-3.1.43/test/data/xfs_target_map.yml
--- old/yast2-packager-3.1.42/test/data/xfs_target_map.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-packager-3.1.43/test/data/xfs_target_map.yml 2014-09-02
09:24:23.000000000 +0200
@@ -0,0 +1,90 @@
+---
+"/dev/vda":
+ bios_id: '0x80'
+ bus: None
+ cyl_count: 4307
+ cyl_size: 8225280
+ device: "/dev/vda"
+ driver: virtio-pci
+ driver_module: virtio_pci
+ label: msdos
+ max_logical: 15
+ max_primary: 4
+ name: vda
+ partitions:
+ - detected_fs: :xfs
+ device: "/dev/vda1"
+ fsid: 131
+ fstype: Linux native
+ name: vda1
+ nr: 1
+ region:
+ - 0
+ - 2220
+ size_k: 17830912
+ type: :primary
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :xfs
+ uuid: 00eea959-67c3-4223-a02d-2fd0dcbc725e
+ - detected_fs: :swap
+ device: "/dev/vda2"
+ fsid: 130
+ fstype: "Linux \n swap"
+ inactive: true
+ mount: swap
+ mountby: :uuid
+ name: vda2
+ nr: 2
+ region:
+ - 2219
+ - 263
+ size_k: 2104320
+ type: :primary
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :swap
+ uuid: 47f2f88d-8b05-46f2-b912-212348586d8f
+ - boot: true
+ detected_fs: :ext4
+ device: "/dev/vda3"
+ fsid: 131
+ fstype: Linux native
+ name: vda3
+ nr: 3
+ region:
+ - 2481
+ - 1308
+ size_k: 10490880
+ type: :primary
+ fstopt: acl,user_xattr
+ mount: "/"
+ mountby: :uuid
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :ext4
+ uuid: 4c486a9b-cc25-40ab-9c49-8203e62a8953
+ - detected_fs: :xfs
+ device: "/dev/vda4"
+ fsid: 131
+ fstype: Linux native
+ name: vda4
+ nr: 4
+ region:
+ - 3788
+ - 519
+ size_k: 4175872
+ type: :primary
+ used_by_device: ''
+ used_by_type: :UB_NONE
+ used_fs: :xfs
+ uuid: 039bbc0d-ebe9-4b0e-ae6b-9b049398143e
+ proposal_name: '1. Disk, 33.00 GiB, /dev/vda, '
+ sector_size: 512
+ size_k: 34603008
+ transport: :unknown
+ type: :CT_DISK
+ unique: KSbE.Fxp0d3BezAE
+ used_by_device: ''
+ used_by_type: :UB_NONE
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.42/test/space_calculation_test.rb
new/yast2-packager-3.1.43/test/space_calculation_test.rb
--- old/yast2-packager-3.1.42/test/space_calculation_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-packager-3.1.43/test/space_calculation_test.rb 2014-09-02
09:24:23.000000000 +0200
@@ -0,0 +1,93 @@
+#! /usr/bin/env rspec
+
+require_relative "./test_helper"
+require 'yaml'
+
+Yast.import 'WFM'
+Yast.import 'Stage'
+Yast.import 'Mode'
+Yast.import 'SCR'
+Yast.import 'SpaceCalculation'
+
+DATA_PATH = File.join(File.expand_path(File.dirname(__FILE__)), "data")
+SCR_TMPDIR_PATH = Yast::Path.new(".target.tmpdir")
+SCR_BASH_PATH = Yast::Path.new(".target.bash")
+
+def stub_target_map(name, with_fstopt)
+ path = File.join(DATA_PATH, "#{name}_target_map.yml")
+ tm = YAML.load_file(path)
+ # Remove the "fstopt" key from every partition
+ if with_fstopt == false
+ tm.each do |k,v|
+ v["partitions"].each {|p| p.delete("fstopt") }
+ end
+ end
+ allow(Yast::WFM).to(receive(:call).with("wrapper_storage",
+ ["GetTargetMap"]).and_return(tm))
+end
+
+def expect_to_execute(command)
+ expect(Yast::SCR).to receive(:Execute).with(SCR_BASH_PATH, command)
+end
+
+describe Yast::SpaceCalculation do
+ describe "#get_partition_info" do
+
+ context "on test mount during installation" do
+ before do
+ allow(Yast::Stage).to receive(:stage).and_return "initial"
+ allow(Yast::Mode).to receive(:mode).and_return "normal"
+
+ stub_target_map(target_map, with_options)
+
+ allow(Yast::SCR).to receive(:Read).with(SCR_TMPDIR_PATH).and_return
"/tmp"
+ allow(Yast::SCR).to receive(:Execute).with(SCR_BASH_PATH, /^test -d.*
mkdir -p/)
+ allow(Yast::SCR).to receive(:Execute).with(SCR_BASH_PATH,
/^\/bin\/umount/)
+ end
+
+ context "on xfs" do
+ let(:target_map) { "xfs" }
+
+ context "with mount options" do
+ let(:with_options) { true }
+
+ it "honours the options and adds 'ro'" do
+ expect_to_execute(/mount -o acl,user_xattr,ro
\/dev\/vda3/).and_return(-1)
+ Yast::SpaceCalculation.get_partition_info
+ end
+ end
+
+ context "without mount options" do
+ let(:with_options) { false }
+
+ it "uses 'ro'" do
+ expect_to_execute(/mount -o ro \/dev\/vda3/).and_return(-1)
+ Yast::SpaceCalculation.get_partition_info
+ end
+ end
+ end
+
+ context "on nfs" do
+ let(:target_map) { "nfs" }
+
+ context "with mount options" do
+ let(:with_options) { true }
+
+ it "honours the options and adds 'ro' and 'nolock'" do
+ expect_to_execute(/mount -o noatime,nfsvers=3,nolock,ro
nfs-host:\/nfsroot/).and_return(-1)
+ Yast::SpaceCalculation.get_partition_info
+ end
+ end
+
+ context "without mount options" do
+ let(:with_options) { false }
+
+ it "uses 'ro,nolock'" do
+ expect_to_execute(/mount -o ro,nolock
nfs-host:\/nfsroot/).and_return(-1)
+ Yast::SpaceCalculation.get_partition_info
+ end
+ end
+ end
+ end
+ end
+end

continue with "q"...


Checked in at Tue Sep 2 15:57:39 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread