Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Sun Oct 16 13:03:05 CEST 2011.
-------- --- openSUSE:Factory/yast2-storage/yast2-storage.changes 2011-10-07 15:22:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2011-10-14 14:18:31.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Oct 10 15:05:41 CEST 2011 - [email protected] + +- disable call of smartctl for certain RAIDs (bnc#720956) +- version 2.21.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.21.8.tar.bz2 New: ---- yast2-storage-2.21.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.MTIzxV/_old 2011-10-16 13:02:59.000000000 +0200 +++ /var/tmp/diff_new_pack.MTIzxV/_new 2011-10-16 13:02:59.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-storage -Version: 2.21.8 +Version: 2.21.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.21.8.tar.bz2 +Source0: yast2-storage-2.21.9.tar.bz2 Prefix: /usr @@ -55,7 +55,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.21.8 +%setup -n yast2-storage-2.21.9 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-storage-2.21.8.tar.bz2 -> yast2-storage-2.21.9.tar.bz2 ++++++ ++++ 5387 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.21.8/VERSION new/yast2-storage-2.21.9/VERSION --- old/yast2-storage-2.21.8/VERSION 2011-10-06 18:14:54.000000000 +0200 +++ new/yast2-storage-2.21.9/VERSION 2011-10-14 14:13:35.000000000 +0200 @@ -1 +1 @@ -2.21.8 +2.21.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.21.8/configure.in new/yast2-storage-2.21.9/configure.in --- old/yast2-storage-2.21.8/configure.in 2011-03-31 12:49:15.000000000 +0200 +++ new/yast2-storage-2.21.9/configure.in 2011-10-14 14:14:12.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.21.0, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.21.9, http://bugs.opensuse.org/, yast2-storage) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.0" +VERSION="2.21.9" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.21.8/storage/src/include/ep-hd.ycp new/yast2-storage-2.21.9/storage/src/include/ep-hd.ycp --- old/yast2-storage-2.21.8/storage/src/include/ep-hd.ycp 2010-08-16 18:28:43.000000000 +0200 +++ new/yast2-storage-2.21.9/storage/src/include/ep-hd.ycp 2011-10-10 15:17:31.000000000 +0200 @@ -242,6 +242,39 @@ } + boolean DiskMaySupportSmart(string disk_device) + { + if (String::StartsWith(disk_device, "/dev/dasd")) + return false; + + map<string, map> target_map = Storage::GetTargetMap(); + map disk = target_map[disk_device]:$[]; + + if (disk["type"]:`CT_UNKNOWN != `CT_DISK) + return false; + + if (contains([ "3w-9xxx" ], disk["driver"]:"")) + return false; + + return true; + } + + + boolean DiskMaySupportHdparm(string disk_device) + { + if (String::StartsWith(disk_device, "/dev/dasd")) + return false; + + map<string, map> target_map = Storage::GetTargetMap(); + map disk = target_map[disk_device]:$[]; + + if (disk["type"]:`CT_UNKNOWN != `CT_DISK) + return false; + + return true; + } + + void HandleHdDiskOverviewTab(any user_data, map event) { string disk_device = (string) user_data; @@ -250,27 +283,19 @@ { case `smart: { - map<string, map> target_map = Storage::GetTargetMap(); - map disk = target_map[disk_device]:$[]; - if (disk["type"]:`CT_UNKNOWN != `CT_DISK || substring(disk_device, 0, 9) == "/dev/dasd") - { + if (!DiskMaySupportSmart(disk_device)) Popup::Error(_("SMART is not available for this disk.")); - break; - } - DisplayCommandOutput(sformat("/usr/sbin/smartctl --health '%1'", disk_device)); + else + DisplayCommandOutput(sformat("/usr/sbin/smartctl --health '%1'", disk_device)); break; } case `hdparm: { - map<string, map> target_map = Storage::GetTargetMap(); - map disk = target_map[disk_device]:$[]; - if (disk["type"]:`CT_UNKNOWN != `CT_DISK || substring(disk_device, 0, 9) == "/dev/dasd") - { + if (!DiskMaySupportHdparm(disk_device)) Popup::Error(_("hdparm is not available for this disk.")); - break; - } - DisplayCommandOutput(sformat("/sbin/hdparm -aAgr '%1'", disk_device)); + else + DisplayCommandOutput(sformat("/sbin/hdparm -aAgr '%1'", disk_device)); break; } } @@ -325,7 +350,7 @@ `Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu), table_header, table_contents), `HBox( - ArrangeButtons(flatten([ + ArrangeButtons(flatten([ [ // push button text `PushButton(`id(`add),`opt(`key_F3), _("Add...")) ], HdButtons(), continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
