summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2006-01-09 21:17:24 +0100
committerKay Sievers <kay.sievers@suse.de>2006-01-09 21:17:24 +0100
commit47fbf3c58260e3fed1078061f8d45e01b0e120f0 (patch)
tree782d00c95dfdf0f33592faf49fb9985e54bf74d8 /extras
parent309d6fd302921489a93dca07f1675c9fc1f74a5a (diff)
path_id: fix invalid character class
Thanks to Marco for the _right_ fix. Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Diffstat (limited to 'extras')
-rwxr-xr-xextras/path_id6
1 files changed, 3 insertions, 3 deletions
diff --git a/extras/path_id b/extras/path_id
index dfb997b340..44fc4820b5 100755
--- a/extras/path_id
+++ b/extras/path_id
@@ -275,7 +275,7 @@ handle_block_usb_storage () {
# usb-storage devs have a serial number, hopefully unique
serial=
if [ -f $controller_dev/../serial ] ; then
- serial="`sed -e 's@^[ -]\{1,\}\|[ -]\{1,\}$@@g;s@[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_0123456789]@@g' < $controller_dev/../serial`"
+ serial="`sed -e 's@^[ -]\{1,\}\|[ -]\{1,\}$@@g;s@[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789-]@@g' < $controller_dev/../serial`"
: serial XXX_${serial}_XXX
d="usb-$serial"
serial="`echo $serial | sed -e 's@[ 0]\{1,\}@@g'`"
@@ -285,10 +285,10 @@ handle_block_usb_storage () {
# has eventually binary junk in vpd
identifier=
if [ -f $controller_dev/../product ] ; then
- product="`sed -e 's@^[ -]\{1,\}\|[ -]\{1,\}$@@g;s@[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_0123456789]@@g' < $controller_dev/../product`"
+ product="`sed -e 's@^[ -]\{1,\}\|[ -]\{1,\}$@@g;s@[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789-]@@g' < $controller_dev/../product`"
fi
if [ -f $controller_dev/../manufacturer ] ; then
- manufacturer="`sed -e 's@^[ -]\{1,\}\|[ -]\{1,\}$@@g;s@[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_0123456789]@@g' < $controller_dev/../manufacturer`"
+ manufacturer="`sed -e 's@^[ -]\{1,\}\|[ -]\{1,\}$@@g;s@[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789-]@@g' < $controller_dev/../manufacturer`"
fi
if [ -z "$product" -o -z "$manufacturer" ] ; then
read idvendor < $controller_dev/../idVendor