Author: aschnell Date: Tue Dec 15 11:49:58 2009 New Revision: 60108 URL: http://svn.opensuse.org/viewcvs/yast?rev=60108&view=rev Log: - added proposal parameter "vm_keep_unpartitioned_region" (fate #308490) Added: trunk/storage/storage/src/testsuite/tests/empty5.err trunk/storage/storage/src/testsuite/tests/empty5.out trunk/storage/storage/src/testsuite/tests/empty5.ycp trunk/storage/storage/src/testsuite/tests/empty6.err trunk/storage/storage/src/testsuite/tests/empty6.out trunk/storage/storage/src/testsuite/tests/empty6.ycp Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageProposal.ycp trunk/storage/storage/src/testsuite/tests/empty3.ycp trunk/storage/storage/src/testsuite/tests/empty4.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=60108&r1=60107&r2=60108&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Dec 15 11:49:58 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 15 10:42:21 CET 2009 - aschnell@suse.de + +- added proposal parameter "vm_keep_unpartitioned_region" (fate + #308490) + +------------------------------------------------------------------- Thu Dec 10 18:48:13 CET 2009 - fehr@suse.de - verify entered crypt passwords in existing crypted devices (#467987) Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageProposal.ycp?rev=60108&r1=60107&r2=60108&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Tue Dec 15 11:49:58 2009 @@ -117,7 +117,7 @@ if (isempty(cfg_xml)) { boolean btmp = ProductFeatures::GetBooleanFeature("partitioning", "try_separate_home"); - cfg_xml["home"] = btmp ? true : false; + cfg_xml["home"] = btmp; integer itmp = ProductFeatures::GetIntegerFeature("partitioning", "root_space_percent"); cfg_xml["root_percent"] = itmp; @@ -139,6 +139,9 @@ if (cfg_xml["root_max"]:0 <= 0) cfg_xml["root_max"] = 10*1024; + btmp = ProductFeatures::GetBooleanFeature("partitioning", "vm_keep_unpartitioned_region"); + cfg_xml["vm_keep_unpartitioned_region"] = btmp; + stmp = ProductFeatures::GetStringFeature("partitioning", "vm_desired_size"); cfg_xml["vm_want"] = Storage::ClassicStringToByte(stmp) / (1024*1024); if (cfg_xml["vm_want"]:0 <= 0) @@ -576,7 +579,7 @@ // space left (fate #303594) y2milestone ("do_vm_disk_conf maximum volume group size from control file: %1", vg_size); integer add_cylinders = g["cylinders"]:0; // whole partition as default - if (vg_size != nil && vg_size > 0) + if (vg_size != nil && vg_size > 0 && GetControlCfg()["vm_keep_unpartitioned_region"]:false) { integer cyl_size = g["size"]:0 / g["cylinders"]:0; add_cylinders = (vg_size * 1024 * 1024) / cyl_size; @@ -715,7 +718,7 @@ integer vg_size = GetControlCfg()["vm_want"]:(15*1024); y2milestone ("do_vm_disk_conf maximum volume group size from control file: %1", vg_size); integer add_cylinders = g["cylinders"]:0; // whole partition as default - if (vg_size != nil && vg_size > 0) + if (vg_size != nil && vg_size > 0 && GetControlCfg()["vm_keep_unpartitioned_region"]:false) { integer cyl_size = g["size"]:0 / g["cylinders"]:0; add_cylinders = (vg_size * 1024 * 1024) / cyl_size; Modified: trunk/storage/storage/src/testsuite/tests/empty3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty3.ycp?rev=60108&r1=60107&r2=60108&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.ycp Tue Dec 15 11:49:58 2009 @@ -9,6 +9,7 @@ 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"); Modified: trunk/storage/storage/src/testsuite/tests/empty4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty4.ycp?rev=60108&r1=60107&r2=60108&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.ycp Tue Dec 15 11:49:58 2009 @@ -9,6 +9,7 @@ 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"); Added: trunk/storage/storage/src/testsuite/tests/empty5.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty5.err?rev=60108&view=auto ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/empty5.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty5.out?rev=60108&view=auto ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.out (added) +++ trunk/storage/storage/src/testsuite/tests/empty5.out Tue Dec 15 11:49:58 2009 @@ -0,0 +1,6 @@ +Proposal: +Create boot partition /dev/sda1 (70.60 MB) with ext4 +Create partition /dev/sda2 (298.02 GB) with id=8E +Create volume group system from /dev/sda2 [destructive] +Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Create swap logical volume /dev/system/swap (768.00 MB) Added: trunk/storage/storage/src/testsuite/tests/empty5.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty5.ycp?rev=60108&view=auto ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.ycp (added) +++ trunk/storage/storage/src/testsuite/tests/empty5.ycp Tue Dec 15 11:49:58 2009 @@ -0,0 +1,16 @@ +{ + include "./lib/setup-system.ycp"; + + setup_system("empty"); + + include "./lib/helper1a.ycp"; + + import "ProductFeatures"; + + 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"); + + include "./lib/helper1b.ycp"; +} Added: trunk/storage/storage/src/testsuite/tests/empty6.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty6.err?rev=60108&view=auto ============================================================================== (empty) Added: trunk/storage/storage/src/testsuite/tests/empty6.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty6.out?rev=60108&view=auto ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.out (added) +++ trunk/storage/storage/src/testsuite/tests/empty6.out Tue Dec 15 11:49:58 2009 @@ -0,0 +1,7 @@ +Proposal: +Create boot partition /dev/sda1 (70.60 MB) with ext4 +Create partition /dev/sda2 (298.02 GB) with id=8E +Create volume group system from /dev/sda2 [destructive] +Create logical volume /dev/system/home (25.00 GB) for /home with ext4 +Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Create swap logical volume /dev/system/swap (768.00 MB) Added: trunk/storage/storage/src/testsuite/tests/empty6.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty6.ycp?rev=60108&view=auto ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.ycp (added) +++ trunk/storage/storage/src/testsuite/tests/empty6.ycp Tue Dec 15 11:49:58 2009 @@ -0,0 +1,16 @@ +{ + include "./lib/setup-system.ycp"; + + setup_system("empty"); + + include "./lib/helper1a.ycp"; + + import "ProductFeatures"; + + 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"); + + include "./lib/helper1b.ycp"; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org