Hello community,
here is the log from the commit of package yast2-repair
checked in at Wed May 7 21:49:27 CEST 2008.
--------
--- yast2-repair/yast2-repair.changes 2008-04-30 15:58:47.000000000 +0200
+++ yast2-repair/yast2-repair.changes 2008-05-07 13:24:02.850368000 +0200
@@ -1,0 +2,7 @@
+Wed May 7 13:09:00 CEST 2008 - jsuchome@suse.cz
+
+- skip checking MD/DM Raid partitions (bnc#304657)
+- more debug messages
+- 2.16.10
+
+-------------------------------------------------------------------
Old:
----
yast2-repair-2.16.9.tar.bz2
New:
----
yast2-repair-2.16.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-repair.spec ++++++
--- /var/tmp/diff_new_pack.A23903/_old 2008-05-07 21:48:46.000000000 +0200
+++ /var/tmp/diff_new_pack.A23903/_new 2008-05-07 21:48:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-repair (Version 2.16.9)
+# spec file for package yast2-repair (Version 2.16.10)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-repair
-Version: 2.16.9
+Version: 2.16.10
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-repair-2.16.9.tar.bz2
+Source0: yast2-repair-2.16.10.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-storage yast2-testsuite
Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage
@@ -35,7 +35,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-repair-2.16.9
+%setup -n yast2-repair-2.16.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,6 +69,10 @@
/usr/share/YaST2/include/repair/*
%doc %{prefix}/share/doc/packages/yast2-repair
%changelog
+* Wed May 07 2008 jsuchome@suse.cz
+- skip checking MD/DM Raid partitions (bnc#304657)
+- more debug messages
+- 2.16.10
* Tue Apr 22 2008 jsuchome@suse.cz
- extended help text if no partition was found (bnc#366856)
- initialize target before source to get correct name of kernel
++++++ yast2-repair-2.16.9.tar.bz2 -> yast2-repair-2.16.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/OSRExecute.ycp new/yast2-repair-2.16.10/src/OSRExecute.ycp
--- old/yast2-repair-2.16.9/src/OSRExecute.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.16.10/src/OSRExecute.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -9,7 +9,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: OSRExecute.ycp 20450 2004-12-01 11:55:31Z jsuchome $
+ * $Id: OSRExecute.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*/
{
module "OSRExecute";
@@ -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);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/OSRFsck.ycp new/yast2-repair-2.16.10/src/OSRFsck.ycp
--- old/yast2-repair-2.16.9/src/OSRFsck.ycp 2008-04-08 12:26:38.000000000 +0200
+++ new/yast2-repair-2.16.10/src/OSRFsck.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -11,7 +11,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: OSRFsck.ycp 43753 2008-01-21 09:08:18Z jsuchome $
+ * $Id: OSRFsck.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*/
{
module "OSRFsck";
@@ -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 &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/OSRFstab.ycp new/yast2-repair-2.16.10/src/OSRFstab.ycp
--- old/yast2-repair-2.16.9/src/OSRFstab.ycp 2008-04-30 15:57:48.000000000 +0200
+++ new/yast2-repair-2.16.10/src/OSRFstab.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -25,7 +25,7 @@
* OSRFstab::Repair();
*
*
- * $Id: OSRFstab.ycp 47234 2008-04-30 13:57:48Z jsuchome $
+ * $Id: OSRFstab.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*/
{
module "OSRFstab";
@@ -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;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/OSRMode.ycp new/yast2-repair-2.16.10/src/OSRMode.ycp
--- old/yast2-repair-2.16.9/src/OSRMode.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.16.10/src/OSRMode.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Special OSR mode
* Authors: Johannes Buchhold
*
- * $Id: OSRMode.ycp 23769 2005-06-21 12:18:10Z jsuchome $
+ * $Id: OSRMode.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*
* Provide osr mode information.
*/
@@ -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" )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/osr_module_partition.ycp new/yast2-repair-2.16.10/src/osr_module_partition.ycp
--- old/yast2-repair-2.16.9/src/osr_module_partition.ycp 2008-04-30 15:57:48.000000000 +0200
+++ new/yast2-repair-2.16.10/src/osr_module_partition.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -11,7 +11,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: osr_module_partition.ycp 47234 2008-04-30 13:57:48Z jsuchome $
+ * $Id: osr_module_partition.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*/
{
@@ -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 );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/OSRSummary.ycp new/yast2-repair-2.16.10/src/OSRSummary.ycp
--- old/yast2-repair-2.16.9/src/OSRSummary.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.16.10/src/OSRSummary.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -14,7 +14,7 @@
* Create a unified-looking RichText description of the not configured/configured devices.
* This is used in _summary.ycp modules.
*
- * $Id: OSRSummary.ycp 20738 2005-01-12 17:47:48Z jsuchome $
+ * $Id: OSRSummary.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*/
{
module "OSRSummary";
@@ -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]:"";
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.9/src/OSRSwap.ycp new/yast2-repair-2.16.10/src/OSRSwap.ycp
--- old/yast2-repair-2.16.9/src/OSRSwap.ycp 2006-09-26 14:43:06.000000000 +0200
+++ new/yast2-repair-2.16.10/src/OSRSwap.ycp 2008-05-07 13:23:39.000000000 +0200
@@ -11,7 +11,7 @@
* Author:
* Johannes Buchhold
*
- * $Id: OSRSwap.ycp 25357 2005-09-05 15:16:52Z jsuchome $
+ * $Id: OSRSwap.ycp 47349 2008-05-07 11:23:39Z jsuchome $
*/
{
module "OSRSwap";
@@ -85,7 +85,12 @@
global define list<string> Partitions() ``{
list<string> ret = [];
- foreach (string dev, map disk, (map >)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