Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2018-05-11 09:13:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Fri May 11 09:13:09 2018 rev:261 rq:606093 version:4.0.32 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2018-05-06 14:58:17.492021518 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2018-05-11 09:13:10.921586009 +0200 @@ -1,0 +2,19 @@ +Thu May 10 06:29:10 UTC 2018 - [email protected] + +- Fix installation on BIOS Raid like Intel RSTe (bsc#1091283) +- 4.0.32 + +------------------------------------------------------------------- +Tue May 8 14:02:52 UTC 2018 - [email protected] + +- Use "none" bootloader when the boot filesystem is nfs + (bsc#1090752). +- 4.0.31 + +------------------------------------------------------------------- +Tue May 8 07:29:07 UTC 2018 - [email protected] + +- Make unit tests architecture agnostic (related to bsc#1091284). +- 4.0.30 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-4.0.29.tar.bz2 New: ---- yast2-bootloader-4.0.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.21Swcw/_old 2018-05-11 09:13:12.853516027 +0200 +++ /var/tmp/diff_new_pack.21Swcw/_new 2018-05-11 09:13:12.857515882 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.0.29 +Version: 4.0.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-4.0.29.tar.bz2 -> yast2-bootloader-4.0.32.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/package/yast2-bootloader.changes new/yast2-bootloader-4.0.32/package/yast2-bootloader.changes --- old/yast2-bootloader-4.0.29/package/yast2-bootloader.changes 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/package/yast2-bootloader.changes 2018-05-10 09:22:44.000000000 +0200 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Thu May 10 06:29:10 UTC 2018 - [email protected] + +- Fix installation on BIOS Raid like Intel RSTe (bsc#1091283) +- 4.0.32 + +------------------------------------------------------------------- +Tue May 8 14:02:52 UTC 2018 - [email protected] + +- Use "none" bootloader when the boot filesystem is nfs + (bsc#1090752). +- 4.0.31 + +------------------------------------------------------------------- +Tue May 8 07:29:07 UTC 2018 - [email protected] + +- Make unit tests architecture agnostic (related to bsc#1091284). +- 4.0.30 + +------------------------------------------------------------------- Fri May 4 12:43:44 UTC 2018 - [email protected] - Inform user when an unsupported bootloader is defined in the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/package/yast2-bootloader.spec new/yast2-bootloader-4.0.32/package/yast2-bootloader.spec --- old/yast2-bootloader-4.0.29/package/yast2-bootloader.spec 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/package/yast2-bootloader.spec 2018-05-10 09:22:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.0.29 +Version: 4.0.32 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/src/lib/bootloader/device_map.rb new/yast2-bootloader-4.0.32/src/lib/bootloader/device_map.rb --- old/yast2-bootloader-4.0.29/src/lib/bootloader/device_map.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/src/lib/bootloader/device_map.rb 2018-05-10 09:22:44.000000000 +0200 @@ -118,6 +118,7 @@ # want to modify its MBR. So we get disk of such partition and change order to add it # to top of device map. For details see bnc#887808,bnc#880439 priority_disks = Yast::BootStorage.boot_disks + return if priority_disks.empty? # if none of priority disk is hd0, then choose one and assign it return if any_first_device?(priority_disks) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/src/lib/bootloader/proposal_client.rb new/yast2-bootloader-4.0.32/src/lib/bootloader/proposal_client.rb --- old/yast2-bootloader-4.0.29/src/lib/bootloader/proposal_client.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/src/lib/bootloader/proposal_client.rb 2018-05-10 09:22:44.000000000 +0200 @@ -32,6 +32,10 @@ ].freeze def make_proposal(attrs) + if Yast::BootStorage.boot_filesystem.is?(:nfs) + ::Bootloader::BootloaderFactory.current_name = "none" + return construct_proposal_map + end force_reset = attrs["force_reset"] storage_read = Yast::BootStorage.storage_read? storage_changed = Yast::BootStorage.storage_changed? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/src/modules/BootStorage.rb new/yast2-bootloader-4.0.32/src/modules/BootStorage.rb --- old/yast2-bootloader-4.0.29/src/modules/BootStorage.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/src/modules/BootStorage.rb 2018-05-10 09:22:44.000000000 +0200 @@ -154,7 +154,7 @@ partitions = select_ancestors(device) do |ancestor| if ancestor.is?(:partition) partitionable = ancestor.partitionable - partitionable.is?(:disk) || partitionable.is?(:multipath) + partitionable.is?(:disk) || partitionable.is?(:multipath) || partitionable.is?(:bios_raid) else false end @@ -192,10 +192,13 @@ # Eg. 2 Disks are parents of 1 Multipath, the disks are just "wires" # to the real disk. multipaths = component.select { |a| a.is?(:multipath) } - multipath_wires = multipaths.each_with_object([]) { |m, r| r.concat(m.parents) } - result = multipaths + disks - multipath_wires + # And same for bios raids + bios_raids = component.select { |a| a.is?(:bios_raid) } + raid_members = bios_raids.each_with_object([]) { |m, r| r.concat(m.parents) } + + result = multipaths + disks + bios_raids - multipath_wires - raid_members log.info "stage1 disks for #{device.inspect} are #{result.inspect}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/src/modules/Bootloader.rb new/yast2-bootloader-4.0.32/src/modules/Bootloader.rb --- old/yast2-bootloader-4.0.29/src/modules/Bootloader.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/src/modules/Bootloader.rb 2018-05-10 09:22:44.000000000 +0200 @@ -204,7 +204,7 @@ # kokso: additional warning that root partition is nfs type -> bootloader will not be installed if BootStorage.boot_filesystem.is?(:nfs) log.info "Bootloader::Summary() -> Boot partition is nfs type, bootloader will not be installed." - return _("The boot partition is of type NFS. Bootloader cannot be installed.") + return [_("The boot partition is of type NFS. Bootloader cannot be installed.")] end ::Bootloader::BootloaderFactory.current.summary(simple_mode: simple_mode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/test/autoyast_converter_test.rb new/yast2-bootloader-4.0.32/test/autoyast_converter_test.rb --- old/yast2-bootloader-4.0.29/test/autoyast_converter_test.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/test/autoyast_converter_test.rb 2018-05-10 09:22:44.000000000 +0200 @@ -10,6 +10,7 @@ describe ".import" do before do + allow(Yast::Arch).to receive(:architecture).and_return("x86_64") allow(Bootloader::BootloaderFactory).to receive(:proposed).and_return(Bootloader::Grub2.new) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/test/boot_storage_test.rb new/yast2-bootloader-4.0.32/test/boot_storage_test.rb --- old/yast2-bootloader-4.0.29/test/boot_storage_test.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/test/boot_storage_test.rb 2018-05-10 09:22:44.000000000 +0200 @@ -63,4 +63,28 @@ ) end end + + describe ".boot_disks" do + context "intel RSTe" do + before do + devicegraph_stub("intel_rst.xml") + end + + it "returns md raid disk device where /boot lives" do + expect(subject.boot_disks.map(&:name)).to eq ["/dev/md/Volume0_0"] + end + end + end + + describe ".boot_partitions" do + context "intel RSTe" do + before do + devicegraph_stub("intel_rst.xml") + end + + it "returns md raid partitions device where /boot lives" do + expect(subject.boot_partitions.map(&:name)).to eq ["/dev/md/Volume0_0p5"] + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/test/bootloader_proposal_client_test.rb new/yast2-bootloader-4.0.32/test/bootloader_proposal_client_test.rb --- old/yast2-bootloader-4.0.29/test/bootloader_proposal_client_test.rb 2018-05-04 15:02:21.000000000 +0200 +++ new/yast2-bootloader-4.0.32/test/bootloader_proposal_client_test.rb 2018-05-10 09:22:44.000000000 +0200 @@ -117,11 +117,11 @@ expect(subject.make_proposal({})).to include("raw_proposal") end - # FIXME: create yaml file with root on nfs - xit "do not check installation errors if install on nfs" do - expect(Yast::BootStorage).to receive(:disk_with_boot_partition).and_return("/dev/nfs").at_least(:once) - - expect(subject.make_proposal({})).to_not include("warning") + it "proposes a none bootloader if the boot filesystem is nfs" do + devicegraph_stub("nfs_root.xml") + subject.make_proposal({}) + expect(Yast::BootStorage.boot_filesystem.is?(:nfs)).to eq(true) + expect(::Bootloader::BootloaderFactory.current.name).to eq("none") end it "report warning if no bootloader selected" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/test/data/intel_rst.xml new/yast2-bootloader-4.0.32/test/data/intel_rst.xml --- old/yast2-bootloader-4.0.29/test/data/intel_rst.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-4.0.32/test/data/intel_rst.xml 2018-05-10 09:22:44.000000000 +0200 @@ -0,0 +1,754 @@ +<?xml version="1.0"?> +<!-- generated by libstorage-ng version 3.3.259, install, 2018-05-09 10:24:35 GMT --> +<Devicegraph> + <Devices> + <Disk> + <sid>42</sid> + <name>/dev/sdb</name> + <sysfs-name>sdb</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:17.0/ata3/host2/target2:0:0/2:0:0:0/block/sdb</sysfs-path> + <region> + <length>976773168</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:00:17.0-ata-3</udev-path> + <udev-id>ata-ST9500620NS_9XF2K30T</udev-id> + <udev-id>scsi-0ATA_ST9500620NS_9XF2K30T</udev-id> + <udev-id>scsi-1ATA_ST9500620NS_9XF2K30T</udev-id> + <udev-id>scsi-35000c500650cb636</udev-id> + <udev-id>scsi-SATA_ST9500620NS_9XF2K30T</udev-id> + <udev-id>wwn-0x5000c500650cb636</udev-id> + <topology/> + <range>256</range> + <rotational>true</rotational> + <transport>SATA</transport> + </Disk> + <Disk> + <sid>43</sid> + <name>/dev/sda</name> + <sysfs-name>sda</sysfs-name> + <sysfs-path>/devices/pci0000:00/0000:00:17.0/ata2/host1/target1:0:0/1:0:0:0/block/sda</sysfs-path> + <region> + <length>976773168</length> + <block-size>512</block-size> + </region> + <udev-path>pci-0000:00:17.0-ata-2</udev-path> + <udev-id>ata-ST9500620NS_9XF2PCER</udev-id> + <udev-id>scsi-0ATA_ST9500620NS_9XF2PCER</udev-id> + <udev-id>scsi-1ATA_ST9500620NS_9XF2PCER</udev-id> + <udev-id>scsi-35000c50065a8494a</udev-id> + <udev-id>scsi-SATA_ST9500620NS_9XF2PCER</udev-id> + <udev-id>wwn-0x5000c50065a8494a</udev-id> + <topology/> + <range>256</range> + <rotational>true</rotational> + <transport>SATA</transport> + </Disk> + <MdContainer> + <sid>44</sid> + <name>/dev/md/imsm0</name> + <sysfs-name>md127</sysfs-name> + <sysfs-path>/devices/virtual/block/md127</sysfs-path> + <region> + <length>0</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-c4b14f18:9c396223:34a53fc7:53410aca</udev-id> + <topology/> + <range>256</range> + <md-level>CONTAINER</md-level> + <uuid>c4b14f18:9c396223:34a53fc7:53410aca</uuid> + <metadata>imsm</metadata> + </MdContainer> + <MdMember> + <sid>45</sid> + <name>/dev/md/Volume0_0</name> + <sysfs-name>md126</sysfs-name> + <sysfs-path>/devices/virtual/block/md126</sysfs-path> + <region> + <length>1855858688</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205</udev-id> + <topology> + <optimal-io-size>32768</optimal-io-size> + </topology> + <range>256</range> + <md-level>RAID0</md-level> + <chunk-size>16384</chunk-size> + <uuid>8de2e85b:ccf393f1:4a2394be:8b243205</uuid> + </MdMember> + <Gpt> + <sid>46</sid> + <pmbr-boot>true</pmbr-boot> + </Gpt> + <Partition> + <sid>47</sid> + <name>/dev/md/Volume0_0p1</name> + <sysfs-name>md126p1</sysfs-name> + <sysfs-path>/devices/virtual/block/md126/md126p1</sysfs-path> + <region> + <start>2048</start> + <length>16384</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205-part1</udev-id> + <type>primary</type> + <id>257</id> + </Partition> + <Partition> + <sid>48</sid> + <name>/dev/md/Volume0_0p2</name> + <sysfs-name>md126p2</sysfs-name> + <sysfs-path>/devices/virtual/block/md126/md126p2</sysfs-path> + <region> + <start>18432</start> + <length>83886080</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205-part2</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Partition> + <sid>49</sid> + <name>/dev/md/Volume0_0p3</name> + <sysfs-name>md126p3</sysfs-name> + <sysfs-path>/devices/virtual/block/md126/md126p3</sysfs-path> + <region> + <start>83904512</start> + <length>83886080</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205-part3</udev-id> + <type>primary</type> + <id>131</id> + <legacy-boot>true</legacy-boot> + </Partition> + <Partition> + <sid>50</sid> + <name>/dev/md/Volume0_0p4</name> + <sysfs-name>md126p4</sysfs-name> + <sysfs-path>/devices/virtual/block/md126/md126p4</sysfs-path> + <region> + <start>1839628288</start> + <length>16230367</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205-part4</udev-id> + <type>primary</type> + <id>130</id> + </Partition> + <Btrfs> + <sid>52</sid> + <uuid>5e18d024-3751-46ec-b931-0f5bc435a952</uuid> + </Btrfs> + <BtrfsSubvolume> + <sid>53</sid> + <id>5</id> + <path></path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>54</sid> + <id>257</id> + <path>@</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>55</sid> + <id>258</id> + <path>@/var</path> + <nocow>true</nocow> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>56</sid> + <id>259</id> + <path>@/usr/local</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>57</sid> + <id>260</id> + <path>@/tmp</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>58</sid> + <id>261</id> + <path>@/srv</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>59</sid> + <id>262</id> + <path>@/root</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>60</sid> + <id>263</id> + <path>@/opt</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>61</sid> + <id>264</id> + <path>@/boot/grub2/x86_64-efi</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>62</sid> + <id>265</id> + <path>@/boot/grub2/i386-pc</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>63</sid> + <id>266</id> + <path>@/.snapshots</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>64</sid> + <id>267</id> + <path>@/.snapshots/1/snapshot</path> + <default-btrfs-subvolume>true</default-btrfs-subvolume> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>65</sid> + <id>270</id> + <path>@/.snapshots/2/snapshot</path> + </BtrfsSubvolume> + <Btrfs> + <sid>66</sid> + <uuid>c7c61f79-83c8-44a3-be9e-664a4f2b73cd</uuid> + </Btrfs> + <BtrfsSubvolume> + <sid>67</sid> + <id>5</id> + <path></path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>68</sid> + <id>257</id> + <path>@</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>69</sid> + <id>258</id> + <path>@/var</path> + <nocow>true</nocow> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>70</sid> + <id>259</id> + <path>@/usr/local</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>71</sid> + <id>260</id> + <path>@/tmp</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>72</sid> + <id>261</id> + <path>@/srv</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>73</sid> + <id>262</id> + <path>@/root</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>74</sid> + <id>263</id> + <path>@/opt</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>75</sid> + <id>264</id> + <path>@/boot/grub2/x86_64-efi</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>76</sid> + <id>265</id> + <path>@/boot/grub2/i386-pc</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>77</sid> + <id>266</id> + <path>@/.snapshots</path> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>78</sid> + <id>267</id> + <path>@/.snapshots/1/snapshot</path> + <default-btrfs-subvolume>true</default-btrfs-subvolume> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>79</sid> + <id>270</id> + <path>@/.snapshots/2/snapshot</path> + </BtrfsSubvolume> + <Swap> + <sid>80</sid> + <uuid>5242c1cc-1567-47a1-830c-cd7c199b0f62</uuid> + </Swap> + <Partition> + <sid>82</sid> + <name>/dev/md/Volume0_0p5</name> + <sysfs-name>md1265</sysfs-name> + <sysfs-path>/devices/virtual/block/md126/md1265</sysfs-path> + <region> + <start>167790592</start> + <length>83886080</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205-part5</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Btrfs> + <sid>83</sid> + </Btrfs> + <BtrfsSubvolume> + <sid>84</sid> + <id>5</id> + <path></path> + </BtrfsSubvolume> + <MountPoint> + <sid>85</sid> + <path>/</path> + <mount-by>uuid</mount-by> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>86</sid> + <id>-1</id> + <path>@</path> + <default-btrfs-subvolume>true</default-btrfs-subvolume> + </BtrfsSubvolume> + <BtrfsSubvolume> + <sid>87</sid> + <id>-1</id> + <path>@/boot/grub2/i386-pc</path> + </BtrfsSubvolume> + <MountPoint> + <sid>88</sid> + <path>/boot/grub2/i386-pc</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/boot/grub2/i386-pc</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>89</sid> + <id>-1</id> + <path>@/boot/grub2/x86_64-efi</path> + </BtrfsSubvolume> + <MountPoint> + <sid>90</sid> + <path>/boot/grub2/x86_64-efi</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/boot/grub2/x86_64-efi</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>91</sid> + <id>-1</id> + <path>@/opt</path> + </BtrfsSubvolume> + <MountPoint> + <sid>92</sid> + <path>/opt</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/opt</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>93</sid> + <id>-1</id> + <path>@/root</path> + </BtrfsSubvolume> + <MountPoint> + <sid>94</sid> + <path>/root</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/root</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>95</sid> + <id>-1</id> + <path>@/srv</path> + </BtrfsSubvolume> + <MountPoint> + <sid>96</sid> + <path>/srv</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/srv</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>97</sid> + <id>-1</id> + <path>@/tmp</path> + </BtrfsSubvolume> + <MountPoint> + <sid>98</sid> + <path>/tmp</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/tmp</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>99</sid> + <id>-1</id> + <path>@/usr/local</path> + </BtrfsSubvolume> + <MountPoint> + <sid>100</sid> + <path>/usr/local</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/usr/local</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <BtrfsSubvolume> + <sid>101</sid> + <id>-1</id> + <path>@/var</path> + <nocow>true</nocow> + </BtrfsSubvolume> + <MountPoint> + <sid>102</sid> + <path>/var</path> + <mount-by>uuid</mount-by> + <mount-options>subvol=/@/var</mount-options> + <mount-type>btrfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <Partition> + <sid>103</sid> + <name>/dev/md/Volume0_0p6</name> + <sysfs-name>md1266</sysfs-name> + <sysfs-path>/devices/virtual/block/md126/md1266</sysfs-path> + <region> + <start>251676672</start> + <length>1587951616</length> + <block-size>512</block-size> + </region> + <udev-id>md-uuid-8de2e85b:ccf393f1:4a2394be:8b243205-part6</udev-id> + <type>primary</type> + <id>131</id> + </Partition> + <Xfs> + <sid>104</sid> + </Xfs> + <MountPoint> + <sid>105</sid> + <path>/home</path> + <mount-by>uuid</mount-by> + <mount-type>xfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + <MountPoint> + <sid>106</sid> + <path>swap</path> + <mount-by>uuid</mount-by> + <mount-type>swap</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + </Devices> + <Holders> + <MdUser> + <source-sid>43</source-sid> + <target-sid>44</target-sid> + <spare>true</spare> + </MdUser> + <MdUser> + <source-sid>42</source-sid> + <target-sid>44</target-sid> + <spare>true</spare> + </MdUser> + <MdUser> + <source-sid>43</source-sid> + <target-sid>45</target-sid> + </MdUser> + <MdUser> + <source-sid>42</source-sid> + <target-sid>45</target-sid> + </MdUser> + <MdSubdevice> + <source-sid>44</source-sid> + <target-sid>45</target-sid> + <member>0</member> + </MdSubdevice> + <User> + <source-sid>45</source-sid> + <target-sid>46</target-sid> + </User> + <Subdevice> + <source-sid>46</source-sid> + <target-sid>47</target-sid> + </Subdevice> + <Subdevice> + <source-sid>46</source-sid> + <target-sid>48</target-sid> + </Subdevice> + <Subdevice> + <source-sid>46</source-sid> + <target-sid>49</target-sid> + </Subdevice> + <Subdevice> + <source-sid>46</source-sid> + <target-sid>50</target-sid> + </Subdevice> + <Subdevice> + <source-sid>52</source-sid> + <target-sid>53</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>48</source-sid> + <target-sid>52</target-sid> + </FilesystemUser> + <Subdevice> + <source-sid>53</source-sid> + <target-sid>54</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>55</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>56</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>57</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>58</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>59</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>60</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>61</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>62</target-sid> + </Subdevice> + <Subdevice> + <source-sid>54</source-sid> + <target-sid>63</target-sid> + </Subdevice> + <Subdevice> + <source-sid>63</source-sid> + <target-sid>64</target-sid> + </Subdevice> + <Subdevice> + <source-sid>63</source-sid> + <target-sid>65</target-sid> + </Subdevice> + <Subdevice> + <source-sid>66</source-sid> + <target-sid>67</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>49</source-sid> + <target-sid>66</target-sid> + </FilesystemUser> + <Subdevice> + <source-sid>67</source-sid> + <target-sid>68</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>69</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>70</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>71</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>72</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>73</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>74</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>75</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>76</target-sid> + </Subdevice> + <Subdevice> + <source-sid>68</source-sid> + <target-sid>77</target-sid> + </Subdevice> + <Subdevice> + <source-sid>77</source-sid> + <target-sid>78</target-sid> + </Subdevice> + <Subdevice> + <source-sid>77</source-sid> + <target-sid>79</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>50</source-sid> + <target-sid>80</target-sid> + </FilesystemUser> + <Subdevice> + <source-sid>46</source-sid> + <target-sid>82</target-sid> + </Subdevice> + <Subdevice> + <source-sid>83</source-sid> + <target-sid>84</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>82</source-sid> + <target-sid>83</target-sid> + </FilesystemUser> + <User> + <source-sid>83</source-sid> + <target-sid>85</target-sid> + </User> + <Subdevice> + <source-sid>84</source-sid> + <target-sid>86</target-sid> + </Subdevice> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>87</target-sid> + </Subdevice> + <User> + <source-sid>87</source-sid> + <target-sid>88</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>89</target-sid> + </Subdevice> + <User> + <source-sid>89</source-sid> + <target-sid>90</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>91</target-sid> + </Subdevice> + <User> + <source-sid>91</source-sid> + <target-sid>92</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>93</target-sid> + </Subdevice> + <User> + <source-sid>93</source-sid> + <target-sid>94</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>95</target-sid> + </Subdevice> + <User> + <source-sid>95</source-sid> + <target-sid>96</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>97</target-sid> + </Subdevice> + <User> + <source-sid>97</source-sid> + <target-sid>98</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>99</target-sid> + </Subdevice> + <User> + <source-sid>99</source-sid> + <target-sid>100</target-sid> + </User> + <Subdevice> + <source-sid>86</source-sid> + <target-sid>101</target-sid> + </Subdevice> + <User> + <source-sid>101</source-sid> + <target-sid>102</target-sid> + </User> + <Subdevice> + <source-sid>46</source-sid> + <target-sid>103</target-sid> + </Subdevice> + <FilesystemUser> + <source-sid>103</source-sid> + <target-sid>104</target-sid> + </FilesystemUser> + <User> + <source-sid>104</source-sid> + <target-sid>105</target-sid> + </User> + <User> + <source-sid>80</source-sid> + <target-sid>106</target-sid> + </User> + </Holders> +</Devicegraph> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-4.0.29/test/data/nfs_root.xml new/yast2-bootloader-4.0.32/test/data/nfs_root.xml --- old/yast2-bootloader-4.0.29/test/data/nfs_root.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-4.0.32/test/data/nfs_root.xml 2018-05-10 09:22:44.000000000 +0200 @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!-- generated by libstorage-ng version 3.3.104, thalassa.suse.de, 2018-01-18 17:17:43 GMT --> +<Devicegraph> + <Devices> + <Nfs> + <sid>42</sid> + <server>srv</server> + <path>/srv/nfs</path> + </Nfs> + <MountPoint> + <sid>43</sid> + <path>/</path> + <mount-by>device</mount-by> + <mount-type>nfs</mount-type> + <active>true</active> + <in-etc-fstab>true</in-etc-fstab> + <freq>0</freq> + <passno>0</passno> + </MountPoint> + </Devices> + <Holders> + <User> + <source-sid>42</source-sid> + <target-sid>43</target-sid> + </User> + </Holders> +</Devicegraph>
