Author: aschnell
Date: Fri Nov 14 16:54:05 2008
New Revision: 53332
URL: http://svn.opensuse.org/viewcvs/yast?rev=53332&view=rev
Log:
- don't call SetTargetMap after checking target-map (bnc #438076, password
didn't survive SetTargetMap call)
- remove Set/GetWholeDisk along the way
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/include/auto_part_create.ycp
trunk/storage/storage/src/include/custom_part_check_generated.ycp
trunk/storage/storage/src/include/ep-main.ycp
trunk/storage/storage/src/inst_target_part.ycp
trunk/storage/storage/src/modules/Storage.ycp
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=53332&r1=53331&r2=53332&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Fri Nov 14 16:54:05 2008
@@ -1,8 +1,13 @@
-------------------------------------------------------------------
+Fri Nov 14 16:39:09 CET 2008 - aschnell@suse.de
+
+- don't call SetTargetMap after checking target-map (bnc #438076)
+- 2.17.51
+
+-------------------------------------------------------------------
Fri Nov 14 13:57:58 CET 2008 - aschnell@suse.de
- keep label and uuid while resizing swap (bnc #445051)
-- 2.17.51
-------------------------------------------------------------------
Wed Nov 12 17:31:56 GMT 2008 - aschnell@suse.de
Modified: trunk/storage/storage/src/include/auto_part_create.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto_part_create.ycp?rev=53332&r1=53331&r2=53332&view=diff
==============================================================================
--- trunk/storage/storage/src/include/auto_part_create.ycp (original)
+++ trunk/storage/storage/src/include/auto_part_create.ycp Fri Nov 14 16:54:05 2008
@@ -119,7 +119,6 @@
``(!p["delete"]:false&&!p["create"]:false));
partitions = filter( map p, partitions, ``(p["type"]:`unknown!=`free));
y2milestone( "create_partitions keep %1", keep );
- Storage::SetWholeDisk( keep == nil );
if( size(vm)==0 )
{
ret = size(partitions)>0;
Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_check_generated.ycp?rev=53332&r1=53331&r2=53332&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Fri Nov 14 16:54:05 2008
@@ -11,17 +11,11 @@
*
* Description: Partitioner for experts.
*
- *
- *
* Purpose:
* -Determing possible partitions.
* -Ask the user which partition to use.
* -Check the input and return error-messages.
*
- * external function: get_partition_info: get a list of current partitions
- * check4partitions: read the disk-information
- * target-agent.bash
- *
*************************************************************
$Id$
@@ -44,24 +38,20 @@
/*---------------------------------------------------------------------
- * Checks the generated partition table. (adds whole_disk - flags to the table)
+ * Checks the generated partition table.
*---------------------------------------------------------------------
* Checkpoints:
* - popup if unformated mounted partitions exist
* - detect the fs on this partition
- * - checks if yast can take a whole disk
- * all partitions have a fsid have of the type 130 131 5 // all fsid 131 partitions are mounted
- *
* - checks if / mountpoint is set
* - check if the boot partition ends in a bootable cylinder (/or/boot)
* - check that all reiser Filesystems are bigger than 60MB
*/
-define list check_created_partition_table( map targetMap, boolean setup_lvm,
- boolean installation )
- ``{
- y2milestone( "now checking generated target map setup_lvm:%1 installation:%2",
- setup_lvm, installation );
+boolean check_created_partition_table(const map targetMap, boolean installation)
+{
+ y2milestone("now checking generated target map installation:%2", installation);
+
string curr_boot_mode = "";
boolean show_all_popups = false;
@@ -92,7 +82,6 @@
integer axp_start_nth = 0;
boolean axp_start_Cr_failure = false;
boolean axp_start_Ex_failure = false;
- boolean all_whole_disk = true;
boolean fat_system_mount = false;
boolean fat_system_boot = false;
boolean dmraid_root = false;
@@ -101,7 +90,6 @@
foreach( string disk, map diskinfo, targetMap,
``{
list<map> part_info = diskinfo["partitions"]:[];
- boolean whole_disk = true;
integer cyl_size = diskinfo["cyl_size"]:1000000;
//////////////////////////////////////////////////////////////
@@ -271,18 +259,6 @@
}
}
- // | NOT
- // v
- if( ! ( fsid==Partitions::fsid_native ||
- fsid==Partitions::fsid_swap ||
- fsid==Partitions::fsid_extended ||
- fsid==Partitions::fsid_extended_win ||
- fsid==Partitions::fsid_raid ||
- fsid==Partitions::fsid_lvm ) )
- {
- whole_disk = false;
- }
-
if( !part["format"]:false && part["used_fs"]:`unknown!=`nfs &&
FileSystems::IsSystemMp( part["mount"]:"", false ) )
{
@@ -291,10 +267,6 @@
});
- whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM;
- diskinfo = add( diskinfo, "whole_disk", whole_disk );
- all_whole_disk = all_whole_disk && whole_disk;
- targetMap = add( targetMap, disk, diskinfo );
});
y2milestone("diskless:%1", diskless);
@@ -303,8 +275,6 @@
dmraid_root, root_raid, boot_raid, raid_type);
- Storage::SetWholeDisk( all_whole_disk );
-
if( (axp_start_Cr_failure && installation) || show_all_popups )
{
// popup text %2 is a disk name e.g. /dev/hda %1 is a number
@@ -657,9 +627,8 @@
if (ret == true) retval = `again;
}
- return( [targetMap, retval] );
- };
-
+ return retval == `next;
+}
define symbol check_devices_used( list<map> partitions, boolean not_cr )
Modified: trunk/storage/storage/src/include/ep-main.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-main.ycp?rev=53332&r1=53331&r2=53332&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-main.ycp (original)
+++ trunk/storage/storage/src/include/ep-main.ycp Fri Nov 14 16:54:05 2008
@@ -323,21 +323,18 @@
{
case `back:
case `abort: {
- if ( !Storage::EqualBackupStates("expert-partitioner", "", true) )
+ if (!Storage::EqualBackupStates("expert-partitioner", "", true))
{
- if ( !ReallyQuit( widget == `back ? back_label : abort_label) )
+ if (!ReallyQuit(widget == `back ? back_label : abort_label))
widget = `again;
}
} break;
case `next: {
- if ( !Storage::EqualBackupStates("expert-partitioner", "", true) )
+ if (!Storage::EqualBackupStates("expert-partitioner", "", true))
{
- list<any> retval = check_created_partition_table(Storage::GetTargetMap(), true,
- Stage::initial() && !Mode::repair());
- Storage::SetTargetMap(retval[0]:$[]);
-
- if (retval[1]:`next != `next)
+ if (!check_created_partition_table(Storage::GetTargetMap(),
+ Stage::initial() && !Mode::repair()))
{
widget = `again;
}
@@ -346,7 +343,7 @@
if (Mode::normal())
{
if (DoApply() == `back)
- widget = `again;
+ widget = `again;
}
}
}
Modified: trunk/storage/storage/src/inst_target_part.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_part.ycp?rev=53332&r1=53331&r2=53332&view=diff
==============================================================================
--- trunk/storage/storage/src/inst_target_part.ycp (original)
+++ trunk/storage/storage/src/inst_target_part.ycp Fri Nov 14 16:54:05 2008
@@ -191,7 +191,6 @@
{
vbox = create_whole_disk_dialog();
vbox = add_common_widgets( vbox );
- Storage::SetWholeDisk( true );
}
// Since resize case and normal case have different help texts we need
@@ -350,7 +349,6 @@
y2milestone ("Don't resize, use entire partition");
Storage::SetDoResize( "NO" );
win_partition_to_delete = tointeger( win_partition["nr"]:-1 );
- Storage::SetWholeDisk( true );
}
}
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=53332&r1=53331&r2=53332&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Fri Nov 14 16:54:05 2008
@@ -243,7 +243,6 @@
/* Storage = TargetMap
/* Storage = $[ "targets" : $[],
- "whole_disk" : false,
"must_reread_partitions" : false,
"win_device" : false,
"testsuite" : false,
@@ -261,7 +260,6 @@
string targets_key = "targets";
string part_mode_key = "part_mode";
string part_disk_key = "part_disk";
- string whole_disk_key = "whole_disk";
string testsuite_key = "testsuite";
string do_resize_key = "do_resize";
string win_device_key = "win_device";
@@ -2148,14 +2146,6 @@
StorageMap = add( StorageMap, part_proposal_mode_key, value );
}
- global define boolean GetWholeDisk()``{
- return StorageMap[whole_disk_key]:false;
- }
-
- global define void SetWholeDisk( boolean value ) ``{
- StorageMap = add( StorageMap, whole_disk_key, value );
- }
-
global define boolean GetPartProposalFirst()``{
return StorageMap[part_proposal_first_key]:true;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
