Author: fehr
Date: Thu Jul 29 16:04:19 2010
New Revision: 62319
URL: http://svn.opensuse.org/viewcvs/yast?rev=62319&view=rev
Log:
- fix bug that destroys encrypted volumes when wron password is entered in read fstab dialog (#625490)
- replace "nofail" with "noauto" for encrypted volumes in fstab during update
Modified:
branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes
branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp
branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp
branches/SuSE-Linux-11_3-Branch/storage/storage/src/modules/StorageUpdate.ycp
Modified: branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes?rev=62319&r1=62318&r2=62319&view=diff
==============================================================================
--- branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes (original)
+++ branches/SuSE-Linux-11_3-Branch/storage/package/yast2-storage.changes Thu Jul 29 16:04:19 2010
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Jul 29 15:53:11 CEST 2010 - fehr@suse.de
+
+- fix bug that destroys encrypted volumes when wron password is
+ entered in read fstab dialog (#625490)
+- replace "nofail" with "noauto" for encrypted volumes in fstab
+ during update
+
+-------------------------------------------------------------------
Mon Jun 21 16:42:34 CEST 2010 - aschnell@suse.de
- avoid unreadable buttons (bnc #615377)
Modified: branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp?rev=62319&r1=62318&r2=62319&view=diff
==============================================================================
--- branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original)
+++ branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/custom_part_dialogs.ycp Thu Jul 29 16:04:19 2010
@@ -41,20 +41,23 @@
symbol check_devices_used( list<map> partitions, boolean not_cr );
-define string DlgCreateCryptFs( string device, integer minpwlen, boolean format,
+define string DlgPasswdCryptFs( string device, integer minpwlen, boolean format,
boolean tmpcrypt )
``{
string helptext = GetCreateCryptFsHelptext(minpwlen, format, tmpcrypt);
- y2milestone( "DlgCreateCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4",
+ y2milestone( "DlgPasswdCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4",
device, minpwlen, format, tmpcrypt );
// heading text
string h = _("Enter your Password for the Encrypted File System.");
- // label text
- string label = _("Don't forget what you enter here!");
+ string label = "";
+ if( format )
+ // label text
+ label = _("Don't forget what you enter here!");
if( tmpcrypt )
{
- label = label + " ";
+ if( size(label)>0 )
+ label = label + " ";
label = label + _("Empty password allowed.");
}
Modified: branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp?rev=62319&r1=62318&r2=62319&view=diff
==============================================================================
--- branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp (original)
+++ branches/SuSE-Linux-11_3-Branch/storage/storage/src/include/ep-import.ycp Thu Jul 29 16:04:19 2010
@@ -346,31 +346,59 @@
boolean format_sys = true;
string device = FstabAddDialog(target_map, fstabs, format_sys);
+ map