Mailinglist Archive: yast-commit (723 mails)

< Previous Next >
[yast-commit] r47349 - in /trunk/repair: ./ package/ src/
  • From: jsuchome@xxxxxxxxxxxxxxxx
  • Date: Wed, 07 May 2008 11:23:39 -0000
  • Message-id: <20080507112339.BDF4929BE3@xxxxxxxxxxxxxxxx>
Author: jsuchome
Date: Wed May 7 13:23:39 2008
New Revision: 47349

URL: http://svn.opensuse.org/viewcvs/yast?rev=47349&view=rev
Log:
- skip checking MD/DM Raid partitions (bnc#304657)
- more debug messages
- 2.16.10


Modified:
trunk/repair/VERSION
trunk/repair/package/yast2-repair.changes
trunk/repair/src/OSR.ycp
trunk/repair/src/OSRExecute.ycp
trunk/repair/src/OSRFsck.ycp
trunk/repair/src/OSRFstab.ycp
trunk/repair/src/OSRMode.ycp
trunk/repair/src/OSRSummary.ycp
trunk/repair/src/OSRSwap.ycp
trunk/repair/src/osr_module_partition.ycp

Modified: trunk/repair/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/VERSION (original)
+++ trunk/repair/VERSION Wed May 7 13:23:39 2008
@@ -1 +1 @@
-2.16.9
+2.16.10

Modified: trunk/repair/package/yast2-repair.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.changes?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/package/yast2-repair.changes (original)
+++ trunk/repair/package/yast2-repair.changes Wed May 7 13:23:39 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Wed May 7 13:09:00 CEST 2008 - jsuchome@xxxxxxx
+
+- skip checking MD/DM Raid partitions (bnc#304657)
+- more debug messages
+- 2.16.10
+
+-------------------------------------------------------------------
Tue Apr 22 11:58:58 CEST 2008 - jsuchome@xxxxxxx

- extended help text if no partition was found (bnc#366856)

Modified: trunk/repair/src/OSR.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSR.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSR.ycp (original)
+++ trunk/repair/src/OSR.ycp Wed May 7 13:23:39 2008
@@ -239,7 +239,7 @@
index = index + 1;
}
}
-// y2debug ("Detection method sequence for module %1 : %2", module_name ,
ret);
+// y2milestone ("Detection method sequence for module %1 : %2",
module_name , ret);
return ret;
}

@@ -495,14 +495,14 @@
maplist (map detect_method, required_module_detection_methods, ``(
detect_method["group"]:""));

- y2debug("Required module groups %1", required_groups );
+ y2milestone("Required module groups %1", required_groups );
if (!OSRCommon::IsSubSet (required_groups, DetectGroupList ()))
{
req_not_in_detection_group = true;
}
});

- y2debug("Requires are not in detection group: %1",
+ y2milestone("Requires are not in detection group: %1",
req_not_in_detection_group );
return ! req_not_in_detection_group;
}

Modified: trunk/repair/src/OSRExecute.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRExecute.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSRExecute.ycp (original)
+++ trunk/repair/src/OSRExecute.ycp Wed May 7 13:23:39 2008
@@ -59,23 +59,23 @@

if ( result == 0 )
{
- y2debug("OSRExecute::CommandOutput: command succeeded: %1", result);
+ y2milestone("OSRExecute::CommandOutput: command succeeded: %1",
result);
}
else if ( result == 126 )
{
- y2debug("OSRExecute::CommandOutput: command found but not executable:
%1", result);
+ y2milestone("OSRExecute::CommandOutput: command found but not
executable: %1", result);
}
else if ( result == 127 )
{
- y2debug("OSRExecute::CommandOutput: command not found: %1", result);
+ y2milestone("OSRExecute::CommandOutput: command not found: %1",
result);
}
else if ( result >= 128 )
{
- y2debug("OSRExecute::CommandOutput: command terminates with fatal
sign N (N=%1-128): %1", result);
+ y2milestone("OSRExecute::CommandOutput: command terminates with fatal
sign N (N=%1-128): %1", result);
}
else
{
- y2debug("OSRExecute::CommandOutput: command terminates with error
code %1", result);
+ y2milestone("OSRExecute::CommandOutput: command terminates with error
code %1", result);
}
}


Modified: trunk/repair/src/OSRFsck.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFsck.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSRFsck.ycp (original)
+++ trunk/repair/src/OSRFsck.ycp Wed May 7 13:23:39 2008
@@ -193,6 +193,13 @@
list<map> partitions = [];

foreach(string dev, map target, Storage::GetTargetMap(), {
+
+ if (target["used_by_type"]:nil == `UB_DMRAID)
+ {
+ // when dmraid is started, partitions cannot be used
+ y2milestone ("disk %1 is used by DM Raid, skipping checks", dev);
+ return;
+ }
foreach(map p, target["partitions"]:[], {

if (p["delete"]:false == false &&

Modified: trunk/repair/src/OSRFstab.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSRFstab.ycp (original)
+++ trunk/repair/src/OSRFstab.ycp Wed May 7 13:23:39 2008
@@ -247,6 +247,15 @@
*/
global define list<string> LinuxPartitions(list checked_partitions) ``{

+ // true if partitions that are part of MD raid array were 'checked'
+ boolean raid_checked (list<string> parts) {
+ boolean ret = true;
+ foreach (string p, parts, {
+ if (!contains (checked_partitions, p))
+ ret = false;
+ });
+ return true;
+ }
if (Mode::test ()) return ["/dev/hda1", "/dev/hda2"];

if (size (checked_partitions) == 0) return [];
@@ -260,6 +269,7 @@
foreach (map partition, description["partitions"]:[], ``{

y2internal ("partition: %1", partition);
+
if ((partition["fsid"]:0 == Partitions::fsid_native ||
partition["type"]:`primary == `lvm ||
partition["type"]:`primary == `sw_raid))
@@ -267,7 +277,8 @@
// if the fsck functions have been executed
if (size (checked_partitions) != 0)
{
- if (contains (checked_partitions,partition["device"]:""))
+ if (contains (checked_partitions,partition["device"]:"")
+ || raid_checked (partition["devices"]:[]))
{
linux_partition_list = add (linux_partition_list,
partition["device"]:"");
@@ -307,6 +318,7 @@
integer i = 0;
foreach (string partition_item, linux_partition_list, ``{

+// FIXME check if already mounted?
y2internal ("partition to check: %1", partition_item);
if ((boolean) WFM::Execute (.local.mount,
[ partition_item, m_point, OSRExecute::OutputFile() ]))
@@ -383,7 +395,7 @@
if (mp != "/")
{
string cmd = sformat ("/usr/bin/test -d %1%2", mount_p,mp);
- y2debug ("command: %1", cmd);
+ y2milestone ("command: %1", cmd);
if (!OSRExecute::Command (.local.bash, cmd))
{
not_fount = true;
@@ -2182,7 +2194,7 @@

if (counter_error == 0)
{
- y2debug("All partitions were successfully umounted from /mnt...");
+ y2milestone("All partitions were successfully umounted from /mnt...");
}
return just_umounted;
}

Modified: trunk/repair/src/OSRMode.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRMode.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSRMode.ycp (original)
+++ trunk/repair/src/OSRMode.ycp Wed May 7 13:23:39 2008
@@ -103,7 +103,7 @@
{
while ( arg_no < size(WFM::Args()) )
{
- y2debug("option #%1: %2", arg_no, WFM::Args(arg_no) );
+ y2milestone("option #%1: %2", arg_no, WFM::Args(arg_no) );

if ( WFM::Args(arg_no) == "automatic" )
{

Modified: trunk/repair/src/OSRSummary.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRSummary.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSRSummary.ycp (original)
+++ trunk/repair/src/OSRSummary.ycp Wed May 7 13:23:39 2008
@@ -291,7 +291,7 @@
});

// correct order!!!
- y2debug("Update the richtext by detect_group_list %1",
OSRCommon::detect_group_list);
+ y2milestone("Update the richtext by detect_group_list %1",
OSRCommon::detect_group_list);
foreach(string g, OSRCommon::detect_group_list, ``{
text = text + group_text_map[g]:"";
});

Modified: trunk/repair/src/OSRSwap.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRSwap.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/OSRSwap.ycp (original)
+++ trunk/repair/src/OSRSwap.ycp Wed May 7 13:23:39 2008
@@ -85,7 +85,12 @@
global define list<string> Partitions() ``{

list<string> ret = [];
- foreach (string dev, map disk, (map<string,map<string,any>
)Storage::GetTargetMap(), ``{
+ foreach (string dev, map disk, Storage::GetTargetMap(), {
+ if (disk["used_by_type"]:nil == `UB_DMRAID)
+ {
+ y2milestone ("disk %1 is used by DM Raid, skipping checks", dev);
+ return;
+ }
if( disk["type"]:`CT_UNKNOWN==`CT_DISK )
{
list l = filter (map p, disk["partitions"]:[], ``(
@@ -94,12 +99,12 @@
p["detected_fs"]:nil == `swap))
);

- ret = (list<string>) union (ret, maplist (map p,
(list<map<string,any> >)l,
- ``(p["device"]:"")));
+ ret = (list<string>)
+ union (ret, maplist (map p, (list<map>) l, ``(p["device"]:"")));
}
});

- y2debug ("GetPartitionList ret=%1", ret );
+ y2milestone ("GetPartitionList ret=%1", ret );
return ret;
};


Modified: trunk/repair/src/osr_module_partition.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.ycp?rev=47349&r1=47348&r2=47349&view=diff
==============================================================================
--- trunk/repair/src/osr_module_partition.ycp (original)
+++ trunk/repair/src/osr_module_partition.ycp Wed May 7 13:23:39 2008
@@ -415,6 +415,13 @@
_("Partition is encrypted: check not supported"));
encrypted_partitions = add (encrypted_partitions, dev_name);
}
+ else if (p["used_by_type"]:nil == `UB_MD)
+ {
+ OSRSummary::DetectOmit (summary_header,
+ // summary text
+ _("Partition is used by MD RAID: check not supported"));
+ checked_partitions = add(checked_partitions, dev_name );
+ }
else
{
boolean fs_ok = OSRFsck::Check( p );

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages