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# 889334 : "unable to check space for encrypted home" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-packager/yast2-packager.changes 2014-09-02 15:57:39.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-packager/yast2-packager.changes 2014-09-03 14:04:54.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 2 11:59:32 UTC 2014 - ancor@suse.com + +- Use DM device for encrypted partitions during test mount + (bnc#889334) +- 3.1.44 + +------------------------------------------------------------------- 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:43515 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-packager-3.1.43.tar.bz2 New: ---- yast2-packager-3.1.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.eNDGBq/_old 2014-09-03 16:39:04.000000000 +0200 +++ /var/tmp/diff_new_pack.eNDGBq/_new 2014-09-03 16:39:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.43 +Version: 3.1.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.43.tar.bz2 -> yast2-packager-3.1.44.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.43/package/yast2-packager.changes new/yast2-packager-3.1.44/package/yast2-packager.changes --- old/yast2-packager-3.1.43/package/yast2-packager.changes 2014-09-02 09:24:22.000000000 +0200 +++ new/yast2-packager-3.1.44/package/yast2-packager.changes 2014-09-03 13:59:55.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 2 11:59:32 UTC 2014 - ancor@suse.com + +- Use DM device for encrypted partitions during test mount + (bnc#889334) +- 3.1.44 + +------------------------------------------------------------------- Mon Sep 1 14:16:27 UTC 2014 - ancor@suse.com - Use options from partitioner during test mount (bnc#873180) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.43/package/yast2-packager.spec new/yast2-packager-3.1.44/package/yast2-packager.spec --- old/yast2-packager-3.1.43/package/yast2-packager.spec 2014-09-02 09:24:22.000000000 +0200 +++ new/yast2-packager-3.1.44/package/yast2-packager.spec 2014-09-03 13:59:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.43 +Version: 3.1.44 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.43/src/modules/SpaceCalculation.rb new/yast2-packager-3.1.44/src/modules/SpaceCalculation.rb --- old/yast2-packager-3.1.43/src/modules/SpaceCalculation.rb 2014-09-02 09:24:23.000000000 +0200 +++ new/yast2-packager-3.1.44/src/modules/SpaceCalculation.rb 2014-09-03 13:59:56.000000000 +0200 @@ -653,8 +653,14 @@ end used = 0 - if !(Ops.get_boolean(part, "create", false) || - Ops.get_boolean(part, "format", false)) + # If reusing a previously existent filesystem + if !(part["create"] || part["format"]) + + # Mount the filesystem to check the available space. + # FIXME: libstorage provides functions to query free + # information for devices (even caching the information). + # This part should be refactored to rely on libstorage. + tmpdir = Convert.to_string(SCR.Read(path(".target.tmpdir"))) tmpdir = Ops.add(tmpdir, "/diskspace_mount") SCR.Execute( @@ -677,10 +683,14 @@ # join the options mount_options_str = mount_options.uniq.join(",") + # Use DM device if it's encrypted, plain device otherwise + # (bnc#889334) + device = part["crypt_device"] || part["device"] || "" + mount_command = Builtins.sformat( "/bin/mount -o %1 %2 %3", mount_options_str, - Ops.get_string(part, "device", ""), + device, tmpdir ) @@ -720,7 +730,7 @@ else Builtins.y2error( "Mount failed, ignoring partition %1", - Ops.get_string(part, "device", "") + device ) @failed_mounts = Builtins.add(@failed_mounts, part) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.43/test/data/luks_target_map.yml new/yast2-packager-3.1.44/test/data/luks_target_map.yml --- old/yast2-packager-3.1.43/test/data/luks_target_map.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-3.1.44/test/data/luks_target_map.yml 2014-09-03 13:59:56.000000000 +0200 @@ -0,0 +1,147 @@ +--- +"/dev/btrfs": + device: "/dev/btrfs" + name: btrfs + partitions: [] + type: :CT_BTRFS + used_by_device: '' + used_by_type: :UB_NONE +"/dev/sda": + bios_id: '0x80' + bus: IDE + cyl_count: 16709 + cyl_size: 8225280 + device: "/dev/sda" + driver: ahci + driver_module: ahci + label: msdos + max_logical: 255 + max_primary: 4 + model: HARDDISK + name: sda + partitions: + - detected_fs: :swap + device: "/dev/sda1" + fsid: 130 + fstype: Linux swap + inactive: true + mount: swap + mountby: :uuid + name: sda1 + nr: 1 + region: + - 0 + - 262 + size_k: 2103296 + type: :primary + udev_id: + - ata-VBOX_HARDDISK_VB57271fd6-27adef38-part1 + - scsi-0ATA_VBOX_HARDDISK_VB57271fd6-27adef38-part1 + - scsi-1ATA_VBOX_HARDDISK_VB57271fd6-27adef38-part1 + - scsi-SATA_VBOX_HARDDISK_VB57271fd6-27adef38-part1 + udev_path: pci-0000:00:1f.2-ata-1.0-part1 + used_by_device: '' + used_by_type: :UB_NONE + used_fs: :swap + uuid: f5f25b5d-22fd-4ed3-9134-715bc1899db5 + - boot: true + detected_fs: :btrfs + device: "/dev/sda2" + format: true + fsid: 131 + fstype: Linux native + inactive: true + mount: "/" + mountby: :uuid + name: sda2 + nr: 2 + region: + - 261 + - 5224 + size_k: 41946112 + subvol: + - create: true + name: "@/boot/grub2/i386-pc" + - create: true + name: "@/boot/grub2/x86_64-efi" + - create: true + name: "@/opt" + - create: true + name: "@/srv" + - create: true + name: "@/tmp" + - create: true + name: "@/usr/local" + - create: true + name: "@/var/crash" + - create: true + name: "@/var/lib/mailman" + - create: true + name: "@/var/lib/named" + - create: true + name: "@/var/lib/pgsql" + - create: true + name: "@/var/log" + - create: true + name: "@/var/opt" + - create: true + name: "@/var/spool" + - create: true + name: "@/var/tmp" + type: :primary + udev_id: + - ata-VBOX_HARDDISK_VB57271fd6-27adef38-part2 + - scsi-0ATA_VBOX_HARDDISK_VB57271fd6-27adef38-part2 + - scsi-1ATA_VBOX_HARDDISK_VB57271fd6-27adef38-part2 + - scsi-SATA_VBOX_HARDDISK_VB57271fd6-27adef38-part2 + udev_path: pci-0000:00:1f.2-ata-1.0-part2 + used_by: + - device: '12345' + type: :UB_BTRFS + used_by_device: '12345' + used_by_type: :UB_BTRFS + used_fs: :btrfs + userdata: + "/": snapshots + uuid: '12345' + - crypt_device: "/dev/mapper/cr_ata-VBOX_HARDDISK_VB57271fd6-27adef38-part3" + detected_fs: :xfs + device: "/dev/sda3" + enc_type: :luks + fsid: 131 + fstype: Linux native + inactive: true + mount: "/home" + mountby: :uuid + name: sda3 + nr: 3 + region: + - 5484 + - 11225 + size_k: 90165248 + type: :primary + udev_id: + - ata-VBOX_HARDDISK_VB57271fd6-27adef38-part3 + - scsi-0ATA_VBOX_HARDDISK_VB57271fd6-27adef38-part3 + - scsi-1ATA_VBOX_HARDDISK_VB57271fd6-27adef38-part3 + - scsi-SATA_VBOX_HARDDISK_VB57271fd6-27adef38-part3 + udev_path: pci-0000:00:1f.2-ata-1.0-part3 + used_by_device: '' + used_by_type: :UB_NONE + used_fs: :xfs + uuid: bcbd324b-dcae-478e-94a6-fa6ef1a4a663 + proposal_name: 1. IDE Disk, 128.00 GiB, /dev/sda, VBOX-HARDDISK + sector_size: 512 + size_k: 134217728 + transport: :sata + type: :CT_DISK + udev_id: + - ata-VBOX_HARDDISK_VB57271fd6-27adef38 + - scsi-0ATA_VBOX_HARDDISK_VB57271fd6-27adef38 + - scsi-1ATA_VBOX_HARDDISK_VB57271fd6-27adef38 + - scsi-SATA_VBOX_HARDDISK_VB57271fd6-27adef38 + udev_path: pci-0000:00:1f.2-ata-1.0 + unique: 3OOL.F0a81fNDOj7 + used_by_device: '' + used_by_type: :UB_NONE + vendor: VBOX diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.43/test/space_calculation_test.rb new/yast2-packager-3.1.44/test/space_calculation_test.rb --- old/yast2-packager-3.1.43/test/space_calculation_test.rb 2014-09-02 09:24:23.000000000 +0200 +++ new/yast2-packager-3.1.44/test/space_calculation_test.rb 2014-09-03 13:59:56.000000000 +0200 @@ -88,6 +88,26 @@ end end end + + context "on non encrypted device" do + let(:target_map) { "xfs" } + let(:with_options) { false } + + it "mounts the plain device" do + expect_to_execute(/mount -o ro \/dev\/vda3/).and_return(-1) + Yast::SpaceCalculation.get_partition_info + end + end + + context "on encrypted device" do + let(:target_map) { "luks" } + let(:with_options) { false } + + it "mounts the DM device" do + expect_to_execute(/mount -o ro \/dev\/mapper\/cr_ata-VBOX_HARDDISK_VB57271fd6-27adef38-part3/).and_return(-1) + Yast::SpaceCalculation.get_partition_info + end + end end end end continue with "q"... Checked in at Wed Sep 3 16:39:16 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