Hello community, here is the log from the commit of package storage-fixup checked in at Sun Nov 23 09:33:38 CET 2008. -------- --- storage-fixup/storage-fixup.changes 2008-10-01 08:48:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/storage-fixup/storage-fixup.changes 2008-11-23 04:03:03.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 23 03:01:45 CEST 2008 - teheo@suse.de + +- quiet option implemented +- updated config, 3 machines added + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ storage-fixup.spec ++++++ --- /var/tmp/diff_new_pack.fkx633/_old 2008-11-23 09:33:29.000000000 +0100 +++ /var/tmp/diff_new_pack.fkx633/_new 2008-11-23 09:33:29.000000000 +0100 @@ -26,7 +26,7 @@ PreReq: %insserv_prereq AutoReqProv: on Version: 0.2 -Release: 23 +Release: 24 Summary: Storage Fixup Script Source0: %{name}-%{version}.tar.bz2 Source1: rc.storage-fixup @@ -82,6 +82,9 @@ /usr/sbin/storage-fixup %changelog +* Sun Nov 23 2008 teheo@suse.de +- quiet option implemented +- updated config, 3 machines added * Wed Oct 01 2008 seife@suse.de - folded patches into tarball - updated config, 10 machines added @@ -92,7 +95,7 @@ - updated config: - add Dell Vostro 1400, Dell Inspiron 1525, Samsung Q45, Mac Mini 1,1, Acer Aspire 1690, HP dv9500. -* Wed Aug 20 2008 seife@suse.de +* Tue Aug 19 2008 seife@suse.de - fix rpmlint errors in the init script * Wed May 28 2008 seife@suse.de - this fixes bug bnc#386555 ++++++ storage-fixup-0.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/storage-fixup-0.2/Changelog new/storage-fixup-0.2/Changelog --- old/storage-fixup-0.2/Changelog 2008-10-01 04:49:59.000000000 +0200 +++ new/storage-fixup-0.2/Changelog 2008-11-21 10:02:02.000000000 +0100 @@ -1,3 +1,120 @@ +commit bd05838900d58d67d3b881513fc3f0440d5cf8bc +Merge: 9282bcd... e55d071... +Author: Tejun Heo <tj@kernel.org> +Date: Mon Nov 17 12:27:18 2008 +0900 + + Merge branch 'master' into suse + +commit e55d071b997eb2861d78729194511a94b778814e +Author: Tejun Heo <tj@kernel.org> +Date: Mon Nov 17 12:26:40 2008 +0900 + + msi-notebook-ex600 entry fixed and asus-m50sv added + +commit ac115fb9e266fe6d5856ca73387f3225b986bc47 +Author: Kel Modderman <kel@otaku42.de> +Date: Wed Oct 29 09:11:51 2008 +1000 + + storage-fixup: a Makefile + + Add a Makefile for convenience of installation and preparing dist. tarball. + + This could be handy for distributions/admins who want to deploy this workaround + in a package. + + tj: updated to create tar in the current directory + + Signed-off-by: Kel Modderman <kel@otaku42.de> + +commit 9282bcd5d8dbab6de12a1639d00bf8595ffe33d1 +Merge: 4490aae... 8eb07d4... +Author: Tejun Heo <tj@kernel.org> +Date: Mon Nov 17 11:17:36 2008 +0900 + + Merge branch 'master' into suse + +commit 8eb07d4a6e908634e752b1b181e5c4b1408a7092 +Author: Kel Modderman <kel@otaku42.de> +Date: Wed Oct 29 09:11:51 2008 +1000 + + storage-fixup: a Makefile + + Add a Makefile for convenience of installation and preparing dist. tarball. + + This could be handy for distributions/admins who want to deploy this workaround + in a package. + + tj: updated to create tar in the current directory + + Signed-off-by: Kel Modderman <kel@otaku42.de> + +commit 4490aae887729aade3ed09d1988fb01aab58d8b1 +Merge: 9ed98e9... f1b2328... +Author: Tejun Heo <tj@kernel.org> +Date: Wed Nov 12 14:52:20 2008 +0900 + + Merge branch 'master' into suse + +commit f1b2328e35a40e5de4d61f54cd3de113a72c0971 +Author: Kel Modderman <kel@otaku42.de> +Date: Wed Oct 29 09:10:56 2008 +1000 + + storage-fixup: manual page + + Add a manual page for storage-fixup script. Description snagged from the wiki. + + Signed-off-by: Kel Modderman <kel@otaku42.de> + +commit e193e95aaa6fe46409be29e77a0254483eb8aed0 +Author: Kel Modderman <kel@otaku42.de> +Date: Wed Oct 29 09:10:25 2008 +1000 + + storage-fixup: make a quiet/silent mode work + + Add a quiet mode. Remove the seemingly unused sact variable. + + tj: modify implementation such that execution header is printed when + !quiet and restore sact. + + Signed-off-by: Kel Modderman <kel@otaku42.de> + +commit 656b6f77cf9bc6b2f174501c74d7c4b39836936e +Author: Kel Modderman <kel@otaku42.de> +Date: Wed Oct 29 09:09:29 2008 +1000 + + storage-fixup: fix typo of configuration filename + + Fix spelling of storage-fixup.conf in storage-fixup script header. + + Signed-off-by: Kel Modderman <kel@otaku42.de> + +commit 074cc2fb7e3b4dbad19c2b1e5d44bf4d22610a46 +Author: Kel Modderman <kel@otaku42.de> +Date: Wed Oct 29 09:08:54 2008 +1000 + + storage-fixup: add ASUS F6S with seagate devices + + The ASUS F6S was generating approx. 3 clicks per minute without the APM + workaround, with two different seagate drives of similar model but differing + cache/capacity. + + Any value ~ 192 or above is enough to have the clicking cease, is the lowest + possible number preferable? + + Signed-off-by: Kel Modderman <kel@otaku42.de> + +commit 9ed98e95ffe7a502ec70ff8cbff28fdd7f7af088 +Author: Tejun Heo <tj@kernel.org> +Date: Wed Oct 1 12:17:39 2008 +0900 + + rc file updated + +commit ce9ab78108376e2a282b689f2b6e3b4a5bc5f53f +Author: Tejun Heo <tj@kernel.org> +Date: Wed Oct 1 11:57:28 2008 +0900 + + Bump release number + commit a62605147e0a8e049d96e7b4c395a373b407c01b Merge: 2231ae6... 260136e... Author: Tejun Heo <tj@kernel.org> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/storage-fixup-0.2/storage-fixup new/storage-fixup-0.2/storage-fixup --- old/storage-fixup-0.2/storage-fixup 2008-10-01 04:50:00.000000000 +0200 +++ new/storage-fixup-0.2/storage-fixup 2008-11-21 10:02:02.000000000 +0100 @@ -6,10 +6,10 @@ # to adjust ATA APM setting. Some laptop BIOSen set this value too # aggressively causing frequent head unloads which can kill the drive # quickly. This script should be called during boot and resume. It -# examines rules from /etc/stroage-fixup.conf and executes matching +# examines rules from /etc/storage-fixup.conf and executes matching # commands. # -# In stroage-fixup.conf, empty lines and lines starting w/ # are +# In storage-fixup.conf, empty lines and lines starting w/ # are # ignored. Each line starts with rule, dmi, ata or act. # # rule RULENAME @@ -47,10 +47,11 @@ # declare usage=" -Usage: storage-fixup [-h] [-V] [-v] [-b] [-c config_file] [-m max_devs] +Usage: storage-fixup [-h] [-V] [-q] [-v] [-b] [-c config_file] [-m max_devs] -h Print this help message and exit -V Print version and exit + -q Quiet -v Verbose -d Dry run, don't actually execute action -c Use config_file instead of /etc/storage-fixup.conf @@ -67,7 +68,7 @@ declare max_devs=64 declare newline=$'\n' -declare dry_run=0 verbose=0 lineno=0 skip=0 rule_name="" reply +declare dry_run=0 quiet=0 verbose=0 lineno=0 skip=0 rule_name="" reply declare -a storage_devs declare -a match_cache declare -a matches @@ -228,6 +229,8 @@ # # do_act - execute action # @act: action to execute +# @no_header: suppress header +# @quiet: be quiet # # Execute @act for each device in $matches. "$DEV" in @act is # substituted with the /dev node of each match. If $dry_run is set, @@ -236,16 +239,20 @@ # Returns 0. # do_act() { - local act="$1" verbose="$2" + local act="$1" no_header="$2" quiet="$3" local id dev for idx in ${matches[@]}; do DEV=${storage_devs[idx]} if [ $dry_run -eq 0 ]; then - if [ $verbose -ne 0 ]; then + if [ $no_header -eq 0 ]; then eval log "$rule_name: executing "$act"" fi - eval "$act" + if [ $quiet -eq 0 ]; then + eval "$act" + else + eval "$act" > /dev/null + fi else eval log "$rule_name: dry-run "$act"" fi @@ -259,10 +266,12 @@ # shopt -s extglob -while getopts "dvVc:m:h" option; do +while getopts "dqvVc:m:h" option; do case $option in d) dry_run=1;; + q) + quiet=1;; v) verbose=1;; V) @@ -345,10 +354,10 @@ do_storage scsi "$f1" "$f2" ;; act) - do_act "$f1 $f2" 1 + do_act "$f1 $f2" $quiet $quiet ;; sact) - do_act "$f1 $f2" 0 + do_act "$f1 $f2" 1 $quiet ;; *) false diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/storage-fixup-0.2/storage-fixup.conf new/storage-fixup-0.2/storage-fixup.conf --- old/storage-fixup-0.2/storage-fixup.conf 2008-10-01 04:50:00.000000000 +0200 +++ new/storage-fixup-0.2/storage-fixup.conf 2008-11-21 10:02:02.000000000 +0100 @@ -151,5 +151,19 @@ rule msi-notebook-ex600 dmi system-manufacturer Micro-Star International dmi system-product-name MSI Notebook EX600 +ata model WDC WD*BEVT* +act hdparm -B 254 $DEV + +# Reported drive model: ST9200420AS +rule asus-f6s +dmi system-manufacturer ASUSTeK Computer Inc. +dmi system-product-name F6S +ata model ST9*AS +act hdparm -B 254 $DEV + +# Reported drive model: WDC WD3200BEVT-22ZCT0 +rule asus-m50sv +dmi system-manufacturer ASUSTeK Computer Inc. +dmi system-product-name M50SV ata model WDC WD*BEVE* act hdparm -B 254 $DEV ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org