Hello community,
here is the log from the commit of package storage-fixup
checked in at Mon Oct 6 17:13:37 CEST 2008.
--------
--- storage-fixup/storage-fixup.changes 2008-09-16 21:17:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/storage-fixup/storage-fixup.changes 2008-10-01 08:48:52.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 1 08:46:14 CEST 2008 - seife@suse.de
+
+- folded patches into tarball
+- updated config, 10 machines added
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
storage-fixup-0.2-20080731.diff
storage-fixup-0.2-conf-20080801.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ storage-fixup.spec ++++++
--- /var/tmp/diff_new_pack.K14269/_old 2008-10-06 17:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.K14269/_new 2008-10-06 17:13:20.000000000 +0200
@@ -26,13 +26,11 @@
PreReq: %insserv_prereq
AutoReqProv: on
Version: 0.2
-Release: 22
+Release: 23
Summary: Storage Fixup Script
Source0: %{name}-%{version}.tar.bz2
Source1: rc.storage-fixup
Source2: pm.storage-fixup
-Patch0: storage-fixup-0.2-20080731.diff
-Patch1: storage-fixup-0.2-conf-20080801.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -49,8 +47,6 @@
%prep
%setup
-%patch0 -p1
-%patch1 -p1
%build
@@ -86,6 +82,9 @@
/usr/sbin/storage-fixup
%changelog
+* Wed Oct 01 2008 seife@suse.de
+- folded patches into tarball
+- updated config, 10 machines added
* Tue Sep 16 2008 seife@suse.de
- bugfixes from current git:
- trim keys and properties
++++++ 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-05-28 08:01:33.000000000 +0200
+++ new/storage-fixup-0.2/Changelog 2008-10-01 04:49:59.000000000 +0200
@@ -1,3 +1,97 @@
+commit a62605147e0a8e049d96e7b4c395a373b407c01b
+Merge: 2231ae6... 260136e...
+Author: Tejun Heo
+Date: Wed Oct 1 11:45:15 2008 +0900
+
+ Merge branch 'master' into suse
+
+commit 260136e8a8079f897c6b33900fe82bfb6e8383d4
+Author: Tejun Heo
+Date: Wed Oct 1 11:44:26 2008 +0900
+
+ Three entries added.
+
+commit 9d7096d41400148444f6b5806eb87d07d1e63fff
+Author: Tejun Heo
+Date: Wed Oct 1 04:26:53 2008 +0900
+
+ Seven entries added.
+
+commit 2231ae67e41ef8e387dde841dd9845515ce45403
+Merge: 59a8ee0... 2251d50...
+Author: Tejun Heo
+Date: Fri Aug 1 17:26:44 2008 +0900
+
+ Merge branch 'master' into suse
+
+commit 2251d50d581e0f81a76b81a5fb856b8efa3bed94
+Author: Tejun Heo
+Date: Fri Aug 1 17:26:14 2008 +0900
+
+ Added dell-inspiron-1525
+
+commit dd494525490759f96821fca614afca981e1d5177
+Author: Tejun Heo
+Date: Fri Aug 1 17:23:14 2008 +0900
+
+ hp-dv9500 prefers 254 over 255 for APM
+
+commit 59a8ee0bdd702ac543a8e11615eb1d15bbdb8d92
+Merge: ad197db... a5794e5...
+Author: Tejun Heo
+Date: Fri Aug 1 08:39:41 2008 +0900
+
+ Merge branch 'master' into suse
+
+commit a5794e5ff295e6ba5bb836648dd0a340806e5972
+Author: Tejun Heo
+Date: Fri Aug 1 08:38:52 2008 +0900
+
+ Drop superflous double quotes around $()
+
+ Signed-off-by: Tejun Heo
+
+commit 0b799bfc90baff58d9c206555033716dc49626ab
+Author: Tejun Heo
+Date: Fri Aug 1 08:36:54 2008 +0900
+
+ Trim keys and properties
+
+ Implement trim and apply it to keys and properties. This is to fix
+ mismatches caused by leading or trailing blanks.
+
+ Signed-off-by: Tejun Heo
+
+commit ad197dbf0d5073f91df162a561744ed030e85c67
+Merge: b582cd5... c9be2c5...
+Author: Tejun Heo
+Date: Thu Jul 31 20:32:24 2008 +0900
+
+ Merge branch 'master' into suse
+
+commit c9be2c53a2d71877a5db680b75641d6d9ed8cc02
+Author: Tejun Heo
+Date: Thu Jul 31 20:31:55 2008 +0900
+
+ Added hp-dv9500
+
+ Signed-off-by: Tejun Heo
+
+commit b582cd5d26dae33a591b7d67e9b97ea2e6f9ad8c
+Merge: 7d1e2a9... 300bc33...
+Author: Tejun Heo
+Date: Thu Jul 31 20:07:29 2008 +0900
+
+ Merge branch 'master' into suse
+
+commit 300bc33945a6f286d0b1e18e9a483cce3502ab68
+Author: Tejun Heo
+Date: Thu Jul 31 19:48:48 2008 +0900
+
+ Add four rules - dell-Vostro-1400, samsung-q45, macmini1_1, acer-aspire-1690
+
+ Signed-off-by: Tejun Heo
+
commit 7d1e2a970180073822412651c33140c8109e8934
Merge: 64e12fc... 632fb98...
Author: Tejun Heo
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-05-28 08:01:33.000000000 +0200
+++ new/storage-fixup-0.2/storage-fixup 2008-10-01 04:50:00.000000000 +0200
@@ -86,6 +86,14 @@
fi
}
+trim() {
+ local str="$1"
+
+ str="${str##*([[:blank:]])}"
+ str="${str%%*([[:blank:]])}"
+ echo -n "$str"
+}
+
#
# search_match_cache - search match cache
# @type: type of match
@@ -98,7 +106,7 @@
# property is returned in $reply.
#
search_match_cache() {
- local type="$1" key="$2" idx="$3"
+ local type="$1" key=$(trim "$2") idx="$3"
local i key_found=0 cache len match
reply=
@@ -136,7 +144,7 @@
# Add $property for $type:$key:$idx.
#
add_to_match_cache() {
- local type="$1" key="$2" idx="$3" property="$4"
+ local type="$1" key=$(trim "$2") idx="$3" property=$(trim "$4")
match_cache+=("$type:$key:$idx $property")
debug "C $type:$key:$idx $property"
@@ -281,27 +289,27 @@
# populate storage info
for ((i=0;i<${#storage_devs};i++)); do
- output="$($hdparm -i ${storage_devs[i]} 2> /dev/null)"
+ output=$($hdparm -i ${storage_devs[i]} 2> /dev/null)
if [ $? -eq 0 ]; then
MODEL=
REV=
SERIAL=
- eval "$(echo "$output" | $sed -nr 's/^\s*Model=\s*(.*\S|\s*)\s*,\s*FwRev=\s*(.*\S|\s*)\s*,\s*SerialNo=\s*(.*\S|\s*)\s*$/MODEL=\"\1\"\nREV=\"\2\"\nSERIAL=\"\3\"/p')"
+ eval $(echo "$output" | $sed -nr 's/^\s*Model=\s*(.*\S|\s*)\s*,\s*FwRev=\s*(.*\S|\s*)\s*,\s*SerialNo=\s*(.*\S|\s*)\s*$/MODEL=\"\1\"\nREV=\"\2\"\nSERIAL=\"\3\"/p')
add_to_match_cache ata model $i "$MODEL"
add_to_match_cache ata rev $i "$REV"
add_to_match_cache ata serial $i "$SERIAL"
fi
- output="$($sg_inq ${storage_devs[i]} 2> /dev/null)"
+ output=$($sg_inq ${storage_devs[i]} 2> /dev/null)
if [ $? -eq 0 ]; then
VENDOR=
MODEL=
REV=
SERIAL=
- eval "$(echo "$output" | $sed -nr 's/^\s*Vendor identification:\s*(.*\S|\s*)\s*$/VENDOR=\"\1\"/p')"
- eval "$(echo "$output" | $sed -nr 's/^\s*Product identification:\s*(.*\S|\s*)\s*$/MODEL=\"\1\"/p')"
- eval "$(echo "$output" | $sed -nr 's/^\s*Product revision level:\s*(.*\S|\s*)\s*$/REV=\"\1\"/p')"
- eval "$(echo "$output" | $sed -nr 's/^\s*Unit serial number:\s*(.*\S|\s*)\s*$/SERIAL=\"\1\"/p')"
+ eval $(echo "$output" | $sed -nr 's/^\s*Vendor identification:\s*(.*\S|\s*)\s*$/VENDOR=\"\1\"/p')
+ eval $(echo "$output" | $sed -nr 's/^\s*Product identification:\s*(.*\S|\s*)\s*$/MODEL=\"\1\"/p')
+ eval $(echo "$output" | $sed -nr 's/^\s*Product revision level:\s*(.*\S|\s*)\s*$/REV=\"\1\"/p')
+ eval $(echo "$output" | $sed -nr 's/^\s*Unit serial number:\s*(.*\S|\s*)\s*$/SERIAL=\"\1\"/p')
add_to_match_cache scsi vendor $i "$VENDOR"
add_to_match_cache scsi model $i "$MODEL"
add_to_match_cache scsi rev $i "$REV"
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-05-28 08:01:33.000000000 +0200
+++ new/storage-fixup-0.2/storage-fixup.conf 2008-10-01 04:50:00.000000000 +0200
@@ -17,6 +17,14 @@
# is usually /dev/sda.
#
+# Reported drive model: ST9120821A
+rule tp-t43
+dmi system-manufacturer IBM
+dmi system-product-name 1871W8P
+dmi system-version ThinkPad T43
+ata model ST9*AS
+act hdparm -B 255 $DEV
+
# Reported drive model: Hitachi HTS722020K9SA00
rule tp-t60
dmi system-manufacturer LENOVO
@@ -25,6 +33,27 @@
ata model Hitachi HTS7220*K9*A*
act hdparm -B 255 $DEV
+# Reported drive model: ST980811AS
+rule hp-nx6325
+dmi system-manufacturer Hewlett-Packard
+dmi system-product-name HP Compaq nx6325*
+ata model ST9*AS
+act hdparm -B 255 $DEV
+
+# Reported drive model: FUJITSU MHV2060BH PL
+rule hp-nx6325-1
+dmi system-manufacturer Hewlett-Packard
+dmi system-product-name HP Compaq nx6325*
+ata model FUJITSU MHV2*BH*
+act hdparm -B 255 $DEV
+
+# Reported drive model: ST9100824AS
+rule hp-nx7400
+dmi system-manufacturer Hewlett-Packard
+dmi system-product-name HP Compaq nx7400
+ata model ST9*AS
+act hdparm -B 255 $DEV
+
# Reported drive model: SAMSUNG HM250JI
rule hp-dv6500
dmi system-manufacturer Hewlett-Packard
@@ -33,9 +62,94 @@
ata model SAMSUNG HM*I
act hdparm -B 255 $DEV
+# Reported drive model: TOSHIBA MK1637GSX
+rule hp-dv9500
+dmi system-manufacturer Hewlett-Packard
+dmi system-product-name HP Pavilion dv9500 Notebook PC
+dmi system-version Rev 1
+ata model TOSHIBA MK*37GSX
+act hdparm -B 254 $DEV
+
# Reported drive model: ST9100824AS
rule dell-e1505
dmi system-manufacturer Dell Inc.
dmi system-product-name MM061
ata model ST9*AS
act hdparm -B 255 $DEV
+
+# Reported drive model: ST9120822AS
+rule dell-Vostro-1400
+dmi system-manufacturer Dell Inc.
+dmi system-product-name Vostro 1400
+ata model ST9*AS
+act hdparm -B 254 $DEV
+
+# Reported drive model: WDC WD2500BEVS-75UST0
+rule dell-xps-m1330
+dmi system-manufacturer Dell Inc.
+dmi system-product-name XPS M1330
+ata model WDC WD*BEVS*
+act hdparm -B 254 $DEV
+
+# Reported drive model: SAMSUNG HM250JI
+rule dell-xps-m1530
+dmi system-manufacturer Dell Inc.
+dmi system-product-name XPS M1530
+ata model SAMSUNG HM*I
+act hdparm -B 254 $DEV
+
+# Reported drive model: WDC WD2500BEVS-75UST0
+rule dell-inspiron-1318
+dmi system-manufacturer Dell Inc.
+dmi system-product-name Inspiron 1318
+ata model WDC WD*BEVS*
+act hdparm -B 254 $DEV
+
+# Reported drive model: WDC WD1600BEVT-75ZCT0
+rule dell-inspiron-1525
+dmi system-manufacturer Dell Inc.
+dmi system-product-name Inspiron 1525
+ata model WDC WD*BEVT*
+act hdparm -B 255 $DEV
+
+# Reported drive model: Hitachi HTS543232L9A300
+rule dell-inspiron-1705
+dmi system-manufacturer Dell Inc.
+dmi system-product-name MP061
+ata model Hitachi HTS5432*
+act hdparm -B 255 $DEV
+
+# Reported drive model: WDC WD1600BEVE-00UYT0
+rule dell-inspirion-ME051
+dmi system-manufacturer Dell Inc.
+dmi system-product-name ME051
+ata model WDC WD*BEVE*
+act hdparm -B 255 $DEV
+
+# Reported drive model: Toshiba MK2546GSX
+rule samsung-q45
+dmi system-manufacturer SAMSUNG ELECTRONICS CO., LTD.
+dmi system-product-name SQ45S70S
+ata model TOSHIBA MK*46GSX
+act hdparm -B 254 $DEV
+
+# Reported drive model: FUJITSU MHV2080BHPL
+rule macmini1_1
+dmi system-manufacturer Apple Computer, Inc.
+dmi system-product-name Macmini1,1
+ata model FUJITSU MHV2*
+act hdparm -B 255 $DEV
+
+# Reported drive model: WDC WD1200BEVE-00WZT0
+rule acer-aspire-1690
+dmi system-manufacturer Acer, inc.
+dmi system-product-name Aspire 1690
+ata model WDC WD*BEVE*
+act hdparm -B 255 $DEV
+
+# Reported drive model: WDC WD3200BEVT-22ZCT0
+rule msi-notebook-ex600
+dmi system-manufacturer Micro-Star International
+dmi system-product-name MSI Notebook EX600
+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