Author: aschnell
Date: Fri Aug 1 14:59:18 2008
New Revision: 49575
URL: http://svn.opensuse.org/viewcvs/yast?rev=49575&view=rev
Log:
- cleanup
Modified:
trunk/storage/storage/src/include/ep-lvm-lib.ycp
trunk/storage/storage/src/include/lvm_pv_lib.ycp
trunk/storage/storage/src/inst_custom_part.ycp
Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-lib.ycp?rev=49575&r1=49574&r2=49575&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Fri Aug 1 14:59:18 2008
@@ -44,7 +44,10 @@
if (size(unused_pvs) < 1)
{
- Error(_("There are not enough suitable unused devices to create a volume group."));
+ Error(_("There are not enough suitable unused devices to create a volume group.
+
+To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused
+RAID device is required. Change your partition table accordingly."));
return;
}
Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_pv_lib.ycp?rev=49575&r1=49574&r2=49575&view=diff
==============================================================================
--- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original)
+++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 14:59:18 2008
@@ -316,24 +316,6 @@
return( ret );
}
-define boolean check_lvm_possible( map targetMap )
- ``{
- boolean possible_part_found = size(get_possible_pvs(targetMap))>0;
- if( !possible_part_found )
- {
- // Translators: the text 'do not format' must match the label in the corresponding popup!
- Popup::Message(_("To use LVM, at least one partition of type 0x8e (or 0x83)
-is required. Change your partition table accordingly.
-In most cases, this can be done in the following way:
-click 'Create', select 'Do not format', and set the File System ID to 0x8e.
-"));
- }
- else if( Mode::normal() )
- {
- possible_part_found = Package::InstallAll( ["lvm2"] );
- }
- return possible_part_found;
- }
boolean check_vgname_dev( string vgname )
{
Modified: trunk/storage/storage/src/inst_custom_part.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_part.ycp?rev=49575&r1=49574&r2=49575&view=diff
==============================================================================
--- trunk/storage/storage/src/inst_custom_part.ycp (original)
+++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 14:59:18 2008
@@ -2903,85 +2903,6 @@
}
}
- /////////////////////////////////////////////////////////////
- // REREAD
- /////////////////////////////////////////////////////////////
-
- if (ret == `reread)
- {
- boolean ret2 = true;
-
- if( ask_reread )
- // popup text
- ret2 = Popup::YesNo(_("Rereading the partition table cancels all current changes. Really reread the partition table?"));
-
- if( ret2 )
- {
- Storage::ReReadTargetMap();
- }
- }
-
-
- /////////////////////////////////////////////////////////////
- // Raid
- /////////////////////////////////////////////////////////////
-
- if( ret == `raid_wizard )
- {
- if( !check_raid_possible( tg ))
- {
- ret = `again;
- continue;
- }
- }
-
- if( ret == `loop_edit || ret == `loop_create )
- {
- string id = (string)UI::QueryWidget( `id(`table), `CurrentItem );
- Storage::SetWizardKey( id );
- if( ret == `loop_edit )
- {
- if( search( id, "/dev/loop" )!=0 )
- {
- // popup text
- Popup::Message( _("Select a loop device entry.") );
- ret = `again;
- continue;
- }
- }
- LoopSetup( ret==`loop_edit );
- if( ret==`loop_create )
- {
- map dev = Storage::GetDisk( Storage::GetTargetMap(), "/dev/loop" );
- UI::ReplaceWidget( `id(`loop_button),
- LoopButton(size(dev["partitions"]:[])) );
- }
- }
-
- if( ret == `nfs || ret == `nfs_edit )
- {
- string id = (string)UI::QueryWidget( `id(`table), `CurrentItem );
- Storage::SetWizardKey( id );
- NfsSetup( ret == `nfs_edit );
- }
-
- /////////////////////////////////////////////////////////////
- // LVM
- /////////////////////////////////////////////////////////////
-
- if (ret == `lvm)
- {
- if( !check_lvm_possible( tg ) )
- {
- ret = `again;
- continue;
- }
- else if( Mode::normal () )
- {
- Package::InstallAll( ["lvm2"] );
- }
- }
-
/////////////////////////////////////////////////////////////
// Adapt mount points from existing /etc/fstab
/////////////////////////////////////////////////////////////
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
