Author: jsuchome Date: Tue Apr 8 13:14:07 2008 New Revision: 46224 URL: http://svn.opensuse.org/viewcvs/yast?rev=46224&view=rev Log: - do not report errors on encrypted partitions (fate#301729) - 2.16.7 Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/osr_module_partition.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=46224&r1=4... ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Tue Apr 8 13:14:07 2008 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chang... ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Tue Apr 8 13:14:07 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 8 13:07:52 CEST 2008 - jsuchome@suse.cz + +- do not report errors on encrypted partitions (fate#301729) +- 2.16.7 + +------------------------------------------------------------------- Wed Apr 2 12:41:44 CEST 2008 - jsuchome@suse.cz - devpts entry is acutally required in /etc/fstab (bnc#366860) Modified: trunk/repair/src/osr_module_partition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.y... ============================================================================== --- trunk/repair/src/osr_module_partition.ycp (original) +++ trunk/repair/src/osr_module_partition.ycp Tue Apr 8 13:14:07 2008 @@ -431,35 +431,36 @@ /** - * + * fsck for all possible partitions */ define boolean OSRPartitionFSCheck()``{ - ///////////////////////////////////////////////////////// - // - // fsck for all possible partitions - // - ///////////////////////////////////////////////////////// list<map> fsck_partitions = (list<map>) OSRCommon::RequireList("fsck_partitions"); list<map> mounted_partitions = (list<map>) OSRCommon::RequireList("mounted_partitions"); list<string> checked_partitions = []; - foreach(map p, fsck_partitions, ``{ + foreach(map p, fsck_partitions, { - string dev_name = p["device"]:""; - // summary header - string summary_header = sformat(_("Executing file system check for partition %1..."), dev_name ); + string dev_name = p["device"]:""; + // summary header + string summary_header = sformat(_("Executing file system check for partition %1..."), dev_name ); - if( size( filter(map p, mounted_partitions, ``(p["spec"]:"" == dev_name ))) != 0 ) - { - // summary text - OSRSummary::DetectOK(summary_header, _("Partition mounted: check impossible")); - checked_partitions = add(checked_partitions, dev_name ); - } - else - { + if( size( filter(map p, mounted_partitions, ``(p["spec"]:"" == dev_name ))) != 0 ) + { + // summary text + OSRSummary::DetectOK(summary_header, _("Partition mounted: check impossible")); + checked_partitions = add(checked_partitions, dev_name ); + } + else if (p["enc_type"]:`none != `none) + { + OSRSummary::DetectOmit (summary_header, + // summary text + _("Partition is encrypted: check not supported")); + } + else + { boolean fs_ok = OSRFsck::Check( p ); symbol used_fs = Storage::GetPartition( Storage::GetTargetMap(), p["device"]:"" )["detected_fs"]:`none; @@ -500,7 +501,7 @@ } } } - } + } }); OSRCommon::ProvideList( "checked_partitions", checked_partitions ); return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org