Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2013-10-20 10:56:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2013-10-14 09:33:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2013-10-20 10:56:29.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 17 13:40:27 CEST 2013 - [email protected] + +- propose to create bios_grub partition on gpt disk for non-EFI + systems (fate#315972) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/COPYING new/yast2-storage-3.1.0/COPYING --- old/yast2-storage-3.1.0/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-storage-3.1.0/COPYING 2013-10-17 13:34:02.000000000 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/package/yast2-storage.changes new/yast2-storage-3.1.0/package/yast2-storage.changes --- old/yast2-storage-3.1.0/package/yast2-storage.changes 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/package/yast2-storage.changes 2013-10-17 13:34:02.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 17 13:40:27 CEST 2013 - [email protected] + +- propose to create bios_grub partition on gpt disk for non-EFI + systems (fate#315972) + +------------------------------------------------------------------- Fri Oct 11 14:26:18 CEST 2013 - [email protected] - adapted to device-mapper device name changes (bnc#810840) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/clients/storage_finish.rb new/yast2-storage-3.1.0/src/clients/storage_finish.rb --- old/yast2-storage-3.1.0/src/clients/storage_finish.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/src/clients/storage_finish.rb 2013-10-17 13:34:02.000000000 +0200 @@ -93,6 +93,8 @@ @part = Storage.GetEntryForMountpoint("/") if Ops.get_symbol(@part, "used_fs", :unknown) == :btrfs if SCR.Execute(path(".target.bash"), "/usr/bin/snapper --no-dbus create-config --fstype=btrfs /") == 0 + SCR.Execute(path(".target.bash"), "/usr/bin/snapper --no-dbus set-config " << + "NUMBER_CLEANUP=yes NUMBER_LIMIT=20 NUMBER_LIMIT_IMPORTANT=10") SCR.Write(path(".sysconfig.yast2.USE_SNAPPER"), "yes") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/include/partitioning/custom_part_check_generated.rb new/yast2-storage-3.1.0/src/include/partitioning/custom_part_check_generated.rb --- old/yast2-storage-3.1.0/src/include/partitioning/custom_part_check_generated.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/src/include/partitioning/custom_part_check_generated.rb 2013-10-17 13:34:02.000000000 +0200 @@ -82,6 +82,7 @@ fat_system_mount = false fat_system_boot = false raid_type = "" + rootdlabel = "" Builtins.foreach(targetMap) do |disk, diskinfo| part_info = Ops.get_list(diskinfo, "partitions", []) @@ -117,6 +118,9 @@ end raid_type = Ops.get_string(part, "raid_type", "") if !boot_raid root_lvm = true if Ops.get_symbol(part, "type", :unknown) == :lvm + if diskinfo.fetch( "type", :CT_UNKNOWN ) == :CT_DISK + rootdlabel = diskinfo.fetch( "label", "" ) + end elsif mountpoint == Partitions.BootMount if (Partitions.EfiBoot || Arch.ia64) && Ops.get_string(diskinfo, "label", "gpt") != "gpt" @@ -189,9 +193,18 @@ end end end + if rootdlabel.empty? + targetMap.values do |diskinfo| + if diskinfo.fetch( "type", :CT_UNKNOWN ) == :CT_DISK && + rootdlabel.empty? + rootdlabel = diskinfo.fetch( "label", "" ) + end + end + end Builtins.y2milestone("diskless:%1", diskless) - Builtins.y2milestone("root_found:%1 root_fs:%2", root_found, root_fs) + Builtins.y2milestone("root_found:%1 root_fs:%2 rootdlabel:%3", + root_found, root_fs, rootdlabel) Builtins.y2milestone( "boot_found:%1 boot_fs:%2 boot_fsid:%3", boot_found, @@ -261,7 +274,7 @@ ok = false if !Popup.YesNo(message) end - if boot_found && installation || show_all_popups + if boot_found && boot_fsid!=Partitions.fsid_bios_grub && installation || show_all_popups if Ops.greater_or_equal(boot_end, Partitions.BootCyl) || show_all_popups # popup text, %1 is a number message = Builtins.sformat( @@ -300,6 +313,19 @@ end #/////////////////////////// NO BOOT /////////////////////////// + if (!boot_found && installation && + !Partitions.EfiBoot && rootdlabel=="gpt") || show_all_popups + message = _( + "Warning: There is no partition of type bios_grub present.\n" + + "To boot from a GPT disk using grub2 such a partition is needed.\n" + + "\n" + + "Really use this setup?\n" + ) + + ok = false if !Popup.YesNo(message) + # set it to true to avoid further possible boot warnings + boot_found = true + end if !boot_found && installation || show_all_popups # iSeries does not really need a boot partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/modules/Storage.rb new/yast2-storage-3.1.0/src/modules/Storage.rb --- old/yast2-storage-3.1.0/src/modules/Storage.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/src/modules/Storage.rb 2013-10-17 13:34:02.000000000 +0200 @@ -4885,6 +4885,10 @@ def_subvol.push("boot/grub2/power-ieee1275") end + if Arch.s390 + def_subvol.push("boot/grub2/s390x") + end + def_subvol.sort!() sv_prepend = "" @@ -6065,70 +6069,68 @@ tg = deep_copy(tg) have_ppc_boot = false Builtins.foreach(tg) do |dev, disk| - Builtins.foreach(Ops.get_list(disk, "partitions", [])) do |part| + disk.fetch("partitions",[]).each do |part| if !have_ppc_boot && - Ops.get_integer(part, "fsid", 0) == Partitions.fsid_prep_chrp_boot && - Builtins.size(Ops.get_string(part, "mount", "")) == 0 && - Ops.get_boolean(part, "create", false) + part.fetch("fsid",0) == Partitions.fsid_prep_chrp_boot && + part.fetch("mount","").empty? && + part.fetch("create",false) have_ppc_boot = true end end end - Builtins.y2milestone( - "SpecialBootHandling: have_ppc_boot:%1", - have_ppc_boot - ) + Builtins.y2milestone( "SpecialBootHandling: ppc_boot:%1", have_ppc_boot) Builtins.foreach(tg) do |dev, disk| new_part = [] - Builtins.foreach(Ops.get_list(disk, "partitions", [])) do |part| + disk.fetch("partitions",[]).each do |part| # convert a mount point of /boot to a 41 PReP boot partition if Partitions.PrepBoot && - Ops.get_string(part, "mount", "") == Partitions.BootMount && - !have_ppc_boot + part.fetch("mount","") == Partitions.BootMount && + !have_ppc_boot id = Partitions.fsid_prep_chrp_boot - Ops.set(part, "format", false) - Ops.set(part, "mount", "") - Ops.set(part, "fstype", Partitions.FsIdToString(id)) - Ops.set(part, "prep_install", true) - if !Ops.get_boolean(part, "create", false) && - Ops.get_integer(part, "fsid", 0) != id - Ops.set(part, "ori_fsid", Ops.get_integer(part, "fsid", 0)) - Ops.set(part, "change_fsid", true) + part["format"]=false + part["mount"]="" + part["fstype"]=Partitions.FsIdToString(id) + part["prep_install"]=true + if !part.fetch("create",false) && + part.fetch("fsid",0) != id + part["ori_fsid"] = part.fetch("fsid",0) + part["change_fsid"] = true end - Ops.set(part, "fsid", id) - Builtins.y2milestone( - "SpecialBootHandling modified Prep part=%1", - part - ) + part["fsid"] = id + Builtins.y2milestone( "SpecialBootHandling modified Prep part=%1", part) end if Arch.board_mac && - Ops.get_string(part, "mount", "") == Partitions.BootMount + part.fetch("mount","") == Partitions.BootMount id = Partitions.fsid_mac_hfs - Ops.set(part, "mount", "") - Ops.set(part, "fstype", Partitions.FsIdToString(id)) - Ops.set(part, "fsid", id) - Ops.set(part, "used_fs", :hfs) - Ops.set(part, "detected_fs", :hfs) - Builtins.y2milestone( - "SpecialBootHandling modified hfs part=%1", - part - ) + part["mount"] = "" + part["fstype"] = Partitions.FsIdToString(id) + part["fsid"] = id + part["used_fs"] = :hfs + part["detected_fs"] = :hfs + Builtins.y2milestone( "SpecialBootHandling modified hfs part=%1", part) end if Arch.ia64 && - Ops.get_string(part, "mount", "") == Partitions.BootMount + part.fetch("mount","") == Partitions.BootMount id = Partitions.fsid_gpt_boot - Ops.set(part, "fsid", id) - Ops.set(part, "fstype", Partitions.FsIdToString(id)) - if !Ops.get_boolean(part, "create", false) && - Ops.get_symbol(part, "detected_fs", :none) == :vfat - Ops.set(part, "format", false) + part["fsid"] = id + part["fstype"] = Partitions.FsIdToString(id) + if !part.fetch("create",false) && + part.fetch("detected_fs",:none)==:vfat + part["format"] = false end - Builtins.y2milestone( - "SpecialBootHandling modified GPT boot part=%1", - part - ) + Builtins.y2milestone( "SpecialBootHandling modified GPT boot part=%1", part) + end + if !Partitions.EfiBoot && (Arch.i386||Arch.x86_64) && + disk.fetch("label","") == "gpt" && + part.fetch("mount","") == Partitions.BootMount + id = Partitions.fsid_bios_grub + part["fsid"] = id + part["fstype"] = Partitions.FsIdToString(id) + part["format"] = false + part["mount"] = "" + Builtins.y2milestone( "SpecialBootHandling modified BIOS grub part=%1", part) end - new_part = Builtins.add(new_part, part) + new_part.push(part) end Ops.set(tg, [dev, "partitions"], new_part) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/src/modules/StorageProposal.rb new/yast2-storage-3.1.0/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.0/src/modules/StorageProposal.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/src/modules/StorageProposal.rb 2013-10-17 13:34:02.000000000 +0200 @@ -604,71 +604,51 @@ def need_boot(disk) - disk = deep_copy(disk) Builtins.y2milestone( "need_boot NeedBoot:%1 GetProposalBtrfs:%2 type:%3", Partitions.NeedBoot, GetProposalBtrfs(), - Ops.get_symbol(disk, "type", :CT_UNKNOWN) + disk.fetch("type",:CT_UNKNOWN) ) ret = Partitions.NeedBoot || - Ops.get_symbol(disk, "type", :CT_UNKNOWN) == :CT_DMRAID + disk.fetch("type",:CT_UNKNOWN) == :CT_DMRAID || + (disk.fetch("label","")=="gpt" && !Partitions.EfiBoot) Builtins.y2milestone("need_boot ret:%1", ret) ret end def try_add_boot(conf, disk, force) - conf = deep_copy(conf) - disk = deep_copy(disk) - boot = Ops.greater_than( - Builtins.size(Builtins.filter(Ops.get_list(conf, "partitions", [])) do |e| - Ops.get_string(e, "mount", "") == Partitions.BootMount - end), - 0 - ) - root = Ops.greater_than( - Builtins.size(Builtins.filter(Ops.get_list(conf, "partitions", [])) do |e| - Ops.get_string(e, "mount", "") == "/" - end), - 0 - ) + pl = conf.fetch("partitions", []) + boot = pl.index { |e| e.fetch("mount","")==Partitions.BootMount }!=nil + root = pl.index { |e| e.fetch("mount","")=="/" }!=nil tc = deep_copy(conf) Builtins.y2milestone("try_add_boot conf %1", conf) Builtins.y2milestone( "try_add_boot boot %1 root %2 force %3 need_boot:%4", - boot, - root, - force, - need_boot(disk) - ) + boot, root, force, need_boot(disk)) if !boot && (root || force) && - (Ops.greater_than( - Ops.get_integer(disk, "cyl_count", 0), - Partitions.BootCyl - ) || - need_boot(disk)) + disk.fetch("cyl_count",0)>Partitions.BootCyl || + need_boot(disk) pb = {} - Ops.set(pb, "mount", Partitions.BootMount) - Ops.set(pb, "size", Partitions.ProposedBootsize) - Ops.set(pb, "fsys", Partitions.DefaultBootFs) - Ops.set(pb, "id", Partitions.FsidBoot) - Ops.set(pb, "auto_added", true) - Ops.set(pb, "max_cyl", Partitions.BootCyl) - Ops.set(pb, "primary", Partitions.BootPrimary) - Ops.set(pb, "maxsize", Partitions.MaximalBootsize) - Ops.set( - tc, - "partitions", - Builtins.add(Ops.get_list(tc, "partitions", []), pb) - ) + pb["mount"] = Partitions.BootMount + pb["size"] = Partitions.ProposedBootsize + if disk.fetch("label","")=="gpt" && !Partitions.EfiBoot + sz = disk.fetch("cyl_size",0)-1024 + sz = 200*1024 if sz<200*1024 + pb["size"] = sz + end + pb["fsys"] = Partitions.DefaultBootFs + pb["id"] = Partitions.FsidBoot + pb["auto_added"] = true + pb["max_cyl"] = Partitions.BootCyl + pb["primary"] = Partitions.BootPrimary + pb["maxsize"] = Partitions.MaximalBootsize + tc["partitions"].push( pb ) Builtins.y2milestone( "try_add_boot disk_cyl %1 boot_cyl %2 need_boot %3 typ %4", - Ops.get_integer(disk, "cyl_count", 0), - Partitions.BootCyl, - Partitions.NeedBoot, - Ops.get_symbol(disk, "type", :CT_UNKNOWN) - ) + disk.fetch("cyl_count",0), Partitions.BootCyl, + Partitions.NeedBoot, disk.fetch("type",:CT_UNKNOWN)) Builtins.y2milestone("try_add_boot boot added automagically pb %1", pb) end deep_copy(tc) @@ -3592,55 +3572,44 @@ def can_boot_reuse(disk, label, boot, max_prim, partitions) - partitions = deep_copy(partitions) ret = [] Builtins.y2milestone("can_boot_reuse boot:%1", boot) if boot && !Partitions.PrepBoot Builtins.y2milestone( "can_boot_reuse disk:%1 max_prim:%2 label:%3 part:%4", - disk, - max_prim, - label, - partitions - ) - pl = [] - pl = Builtins.filter(partitions) do |p| - !Ops.get_boolean(p, "delete", false) && - Ops.greater_or_equal( - Ops.multiply(Ops.get_integer(p, "size_k", 0), 1024), - Partitions.MinimalBootsize - ) + disk, max_prim, label, partitions) + pl = partitions.select do |p| + !p.fetch("delete",false) && + (p.fetch("size_k",0)*1024>=Partitions.MinimalBootsize|| + p.fetch("fsid",0)==Partitions.fsid_bios_grub) end + Builtins.y2milestone( "can_boot_reuse pl:%1", pl ) boot2 = Builtins.find(pl) do |p| - Ops.get_integer(p, "fsid", 0) == Partitions.fsid_gpt_boot || - Ops.get_integer(p, "fsid", 0) == Partitions.FsidBoot && - Ops.less_or_equal( - Ops.multiply(Ops.get_integer(p, "size_k", 0), 1024), - Partitions.MaximalBootsize - ) || - Ops.get_symbol(p, "detected_fs", :unknown) == :hfs && - Ops.get_boolean(p, "boot", false) && - label == "mac" || - Ops.get_integer(p, "fsid", 0) == Partitions.fsid_prep_chrp_boot && - Ops.less_or_equal(Ops.get_integer(p, "nr", 0), max_prim) && - Partitions.PrepBoot - end - ret = Builtins.maplist(partitions) do |p| - if !Ops.get_boolean(p, "delete", false) && - Ops.get_string(p, "device", "") == - Ops.get_string(boot2, "device", "") && - Storage.CanEdit(p, false) - p = Storage.SetVolOptions( - p, - Partitions.BootMount, - Partitions.DefaultBootFs, - "", - "", - "" - ) - end - deep_copy(p) - end if boot2 != nil + p.fetch("fsid",0) == Partitions.fsid_gpt_boot || + p.fetch("fsid",0) == Partitions.FsidBoot && + p.fetch("size_k",0)*1024<=Partitions.MaximalBootsize || + p.fetch("detected_fs",:unknown) == :hfs && + p.fetch("boot",false) && + label == "mac" || + p.fetch("fsid",0) == Partitions.fsid_prep_chrp_boot && + p.fetch("nr",0)<=max_prim && + Partitions.PrepBoot || + p.fetch("fsid",0) == Partitions.fsid_bios_grub && + label=="gpt" && + !Partitions.EfiBoot + end + Builtins.y2milestone("can_boot_reuse boot2:%1", boot2) + if boot2 != nil + ret = partitions.map do |p| + if !p.fetch("delete",false) && + p.fetch("device","") == boot2.fetch("device","") && + Storage.CanEdit(p, false) + p = Storage.SetVolOptions( p, Partitions.BootMount, + Partitions.DefaultBootFs, "", "", "") + end + p + end + end Builtins.y2milestone("can_boot_reuse ret:%1", ret) end deep_copy(ret) @@ -4119,7 +4088,8 @@ Partitions.fsid_native, Partitions.fsid_swap, Partitions.fsid_lvm, - Partitions.fsid_raid + Partitions.fsid_raid, + Partitions.fsid_bios_grub ] remk = ["del_ptable", "disklabel"] Builtins.foreach(ddev) do |s| @@ -5043,7 +5013,7 @@ def sizek_to_pe(pek, pebyte, pvcreate) ret = Ops.divide( - Ops.subtract(pek, pvcreate ? 500 : 0), + Ops.subtract(pek, pvcreate ? 4000 : 0), Ops.divide(pebyte, 1024) ) Builtins.y2milestone( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty-efi1.rb new/yast2-storage-3.1.0/testsuite/tests/empty-efi1.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty-efi1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty-efi1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,22 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - false - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty-efi2.rb new/yast2-storage-3.1.0/testsuite/tests/empty-efi2.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty-efi2.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty-efi2.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,22 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty1.rb new/yast2-storage-3.1.0/testsuite/tests/empty1.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,22 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - false - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty2.rb new/yast2-storage-3.1.0/testsuite/tests/empty2.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty2.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty2.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,22 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty3.out new/yast2-storage-3.1.0/testsuite/tests/empty3.out --- old/yast2-storage-3.1.0/testsuite/tests/empty3.out 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty3.out 2013-10-17 13:34:02.000000000 +0200 @@ -1,6 +1,6 @@ Dump Proposal: Dump Create boot volume /dev/sda1 (400.06 MB) with ext4 Dump Create volume /dev/sda2 (29.96 GB) -Dump Create volume group system (29.96 GB) from /dev/sda2 [destructive] +Dump Create volume group system (29.95 GB) from /dev/sda2 [destructive] Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (512.00 MB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty3.rb new/yast2-storage-3.1.0/testsuite/tests/empty3.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty3.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty3.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,27 +12,11 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - false - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) - ProductFeatures.SetBooleanFeature( - "partitioning", - "vm_keep_unpartitioned_region", - true - ) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetBooleanFeature("partitioning", "vm_keep_unpartitioned_region", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty4.out new/yast2-storage-3.1.0/testsuite/tests/empty4.out --- old/yast2-storage-3.1.0/testsuite/tests/empty4.out 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty4.out 2013-10-17 13:34:02.000000000 +0200 @@ -1,7 +1,7 @@ Dump Proposal: Dump Create boot volume /dev/sda1 (400.06 MB) with ext4 Dump Create volume /dev/sda2 (29.96 GB) -Dump Create volume group system (29.96 GB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/home (19.46 GB) for /home with ext4 +Dump Create volume group system (29.95 GB) from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (19.45 GB) for /home with ext4 Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (512.00 MB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty4.rb new/yast2-storage-3.1.0/testsuite/tests/empty4.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty4.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty4.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,27 +12,11 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) - ProductFeatures.SetBooleanFeature( - "partitioning", - "vm_keep_unpartitioned_region", - true - ) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetBooleanFeature("partitioning", "vm_keep_unpartitioned_region", true) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty5.out new/yast2-storage-3.1.0/testsuite/tests/empty5.out --- old/yast2-storage-3.1.0/testsuite/tests/empty5.out 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty5.out 2013-10-17 13:34:02.000000000 +0200 @@ -1,6 +1,6 @@ Dump Proposal: Dump Create boot volume /dev/sda1 (400.06 MB) with ext4 Dump Create volume /dev/sda2 (297.70 GB) -Dump Create volume group system (297.70 GB) from /dev/sda2 [destructive] +Dump Create volume group system (297.69 GB) from /dev/sda2 [destructive] Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (768.00 MB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty5.rb new/yast2-storage-3.1.0/testsuite/tests/empty5.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty5.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty5.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,22 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - false - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", false) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty6.out new/yast2-storage-3.1.0/testsuite/tests/empty6.out --- old/yast2-storage-3.1.0/testsuite/tests/empty6.out 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty6.out 2013-10-17 13:34:02.000000000 +0200 @@ -1,7 +1,7 @@ Dump Proposal: Dump Create boot volume /dev/sda1 (400.06 MB) with ext4 Dump Create volume /dev/sda2 (297.70 GB) -Dump Create volume group system (297.70 GB) from /dev/sda2 [destructive] +Dump Create volume group system (297.69 GB) from /dev/sda2 [destructive] Dump Create logical volume /dev/system/home (25.00 GB) for /home with ext4 Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (768.00 MB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/empty6.rb new/yast2-storage-3.1.0/testsuite/tests/empty6.rb --- old/yast2-storage-3.1.0/testsuite/tests/empty6.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/empty6.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,22 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", true) - ProductFeatures.SetStringFeature( - "partitioning", - "vm_desired_size", - "30 GB" - ) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "vm_desired_size", "30 GB") + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/half-empty1.rb new/yast2-storage-3.1.0/testsuite/tests/half-empty1.rb --- old/yast2-storage-3.1.0/testsuite/tests/half-empty1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/half-empty1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,17 +12,9 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "20 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "20 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/reuse-home1.rb new/yast2-storage-3.1.0/testsuite/tests/reuse-home1.rb --- old/yast2-storage-3.1.0/testsuite/tests/reuse-home1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/reuse-home1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,18 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "15 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/windows-only-efi1.rb new/yast2-storage-3.1.0/testsuite/tests/windows-only-efi1.rb --- old/yast2-storage-3.1.0/testsuite/tests/windows-only-efi1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/windows-only-efi1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,18 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "15 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/windows-only1.rb new/yast2-storage-3.1.0/testsuite/tests/windows-only1.rb --- old/yast2-storage-3.1.0/testsuite/tests/windows-only1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/windows-only1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,18 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "15 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") Yast.include self, "helper1b.rb" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.0/testsuite/tests/windows1.rb new/yast2-storage-3.1.0/testsuite/tests/windows1.rb --- old/yast2-storage-3.1.0/testsuite/tests/windows1.rb 2013-10-11 16:25:32.000000000 +0200 +++ new/yast2-storage-3.1.0/testsuite/tests/windows1.rb 2013-10-17 13:34:02.000000000 +0200 @@ -12,18 +12,10 @@ Yast.import "ProductFeatures" - ProductFeatures.SetBooleanFeature( - "partitioning", - "try_separate_home", - true - ) + ProductFeatures.SetBooleanFeature("partitioning", "try_separate_home", true) ProductFeatures.SetBooleanFeature("partitioning", "proposal_lvm", false) ProductFeatures.SetStringFeature("partitioning", "root_max_size", "20 GB") - ProductFeatures.SetStringFeature( - "partitioning", - "root_base_size", - "15 GB" - ) + ProductFeatures.SetStringFeature("partitioning", "root_base_size", "15 GB") Yast.include self, "helper1b.rb" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
