-- tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
-+ tmp_disk=`echo "$1" | sed -e 's%\([vsh]d[a-z]\)[0-9]*$%\1%' \
- -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
- -e 's%\(fd[0-9]*\)$%\1%' \
- -e 's%/part[0-9]*$%/disc%' \
- -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
-- tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
-+ tmp_part=`echo "$1" | sed -e 's%.*/[vsh]d[a-z]\([0-9]*\)$%\1%' \
- -e 's%.*d[0-9]*p%%' \
- -e 's%.*/fd[0-9]*$%%' \
- -e 's%.*/floppy/[0-9]*$%%' \
-@@ -333,6 +333,10 @@
+ # formats that need to be handled (disk name -> partition name):
+ # floppies: /dev/fd0
+- # normal sd/hd devices: /dev/hda -> /dev/hda3
++ # normal sd/hd/vd devices: /dev/hda -> /dev/hda3
+ # md: /dev/md0 -> /dev/md0p0
+ # ide raid devs: /dev/ide/host0/bus0/target0/lun0/disc
+ # -> /dev/ide/host0/bus0/target0/lun0/part1
+@@ -134,7 +134,7 @@
+ # more?
+ tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
+ grep -v '/mapper/[[:alnum:]_]\+-[[:digit:]]\+$' | uniq |
+- sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
++ sed -e 's%\([shv]d[a-z]\)[0-9]*$%\1%' \
+ -e 's%\(/c[0-9]\+d[0-9]\+\).*$%\1%' \
+ -e 's%\(fd[0-9]*\)$%\1%' \
+ -e 's%/part[0-9]*$%/disc%' \
+@@ -142,7 +142,7 @@
+ -e 's%\(/mapper/[[:alnum:]]\+\(_[[:alnum:]]\+\)\+\)\p[[:digit:]]\+$%\1%'`
+ tmp_part=`echo "$1" | grep -v '/mapper/control$' |
+ grep -v '/mapper/[[:alnum:]_]\+-[[:digit:]]\+$' | uniq |
+- sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
++ sed -e 's%.*/[shv]d[a-z]\([0-9]*\)$%\1%' \
+ -e 's%.*/c[0-9]\+d[0-9]\+p\([[:digit:]]\+\)%\1%' \
+ -e 's%.*/c[0-9]\+d[0-9]\+$%%' \
+ -e 's%.*/fd[0-9]\+$%%' \
+@@ -509,6 +509,10 @@