|
 |
3adda6 |
diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
|
|
|
3adda6 |
index aa6fc938..4bc59131 100644
|
|
|
3adda6 |
--- a/usr/share/rear/lib/layout-functions.sh
|
|
|
3adda6 |
+++ b/usr/share/rear/lib/layout-functions.sh
|
|
|
3adda6 |
@@ -478,6 +478,9 @@ get_sysfs_name() {
|
|
|
3adda6 |
### /dev/dm-3 -> /dev/mapper/system-tmp
|
|
|
3adda6 |
### /dev/dm-4 -> /dev/mapper/oralun
|
|
|
3adda6 |
### /dev/dm-5 -> /dev/mapper/oralunp1
|
|
|
3adda6 |
+### /dev/sda -> /dev/sda
|
|
|
3adda6 |
+###
|
|
|
3adda6 |
+### Returns 0 on success, 1 if device is not existing
|
|
|
3adda6 |
get_device_name() {
|
|
|
3adda6 |
### strip common prefixes
|
|
|
3adda6 |
local name=${1#/dev/}
|
|
|
3adda6 |
@@ -485,47 +488,39 @@ get_device_name() {
|
|
|
3adda6 |
|
|
|
3adda6 |
contains_visible_char "$name" || BugError "Empty string passed to get_device_name"
|
|
|
3adda6 |
|
|
|
3adda6 |
- ### Translate dm-8 -> mapper/test
|
|
|
3adda6 |
- local device dev_number mapper_number
|
|
|
3adda6 |
- if [[ -d /sys/block/$name ]] ; then
|
|
|
3adda6 |
+ if [[ "$name" =~ ^mapper/ ]]; then
|
|
|
3adda6 |
+ echo "/dev/$name"
|
|
|
3adda6 |
+ return 0
|
|
|
3adda6 |
+ fi
|
|
|
3adda6 |
+
|
|
|
3adda6 |
+ if [[ -L "/dev/$name" ]] ; then
|
|
|
3adda6 |
+ # Map vg/lv into dm-X, which will then be resolved later
|
|
|
3adda6 |
+ name="$( basename $(readlink -f /dev/$name) )"
|
|
|
3adda6 |
+ fi
|
|
|
3adda6 |
+
|
|
|
3adda6 |
+ if [[ "$name" =~ ^dm- ]] ; then
|
|
|
3adda6 |
+ local device
|
|
|
3adda6 |
if [[ -r /sys/block/$name/dm/name ]] ; then
|
|
|
3adda6 |
### recent kernels have a dm subfolder
|
|
|
3adda6 |
- echo "/dev/mapper/$( < /sys/block/$name/dm/name)";
|
|
|
3adda6 |
- return 0
|
|
|
3adda6 |
+ device="$( < /sys/block/$name/dm/name )"
|
|
|
3adda6 |
else
|
|
|
3adda6 |
- ### loop over all block devices
|
|
|
3adda6 |
- dev_number=$( < /sys/block/$name/dev)
|
|
|
3adda6 |
- for device in /dev/mapper/* ; do
|
|
|
3adda6 |
- mapper_number=$(dmsetup info -c --noheadings -o major,minor ${device#/dev/mapper/} 2>/dev/null )
|
|
|
3adda6 |
- if [ "$dev_number" = "$mapper_number" ] ; then
|
|
|
3adda6 |
- echo "$device"
|
|
|
3adda6 |
- return 0
|
|
|
3adda6 |
- fi
|
|
|
3adda6 |
- done
|
|
|
3adda6 |
+ local dev_number=$( < /sys/block/$name/dev)
|
|
|
3adda6 |
+ if [[ ! -r "$TMP_DIR/dmsetup_info.txt" ]] ; then
|
|
|
3adda6 |
+ dmsetup info --noheadings -c -o name,major,minor > "$TMP_DIR/dmsetup_info.txt"
|
|
|
3adda6 |
+ fi
|
|
|
3adda6 |
+ device="$( awk -F ':' "/$dev_number\$/ { print \$1 }" < "$TMP_DIR/dmsetup_info.txt" )"
|
|
|
3adda6 |
+ [[ -n "$device" ]] || BugError "No device returned for major/minor $dev_number"
|
|
|
3adda6 |
fi
|
|
|
3adda6 |
- fi
|
|
|
3adda6 |
-
|
|
|
3adda6 |
- ### Translate device name to mapper name. ex: vg/lv -> mapper/vg-lv
|
|
|
3adda6 |
- if [[ "$name" =~ ^mapper/ ]]; then
|
|
|
3adda6 |
- echo "/dev/$name"
|
|
|
3adda6 |
+ echo "/dev/mapper/$device"
|
|
|
3adda6 |
return 0
|
|
|
3adda6 |
fi
|
|
|
3adda6 |
- if my_dm=`readlink /dev/$name`; then
|
|
|
3adda6 |
- for mapper_dev in /dev/mapper/*; do
|
|
|
3adda6 |
- if mapper_dm=`readlink $mapper_dev`; then
|
|
|
3adda6 |
- if [ "$my_dm" = "$mapper_dm" ]; then
|
|
|
3adda6 |
- echo $mapper_dev
|
|
|
3adda6 |
- return 0
|
|
|
3adda6 |
- fi
|
|
|
3adda6 |
- fi
|
|
|
3adda6 |
- done
|
|
|
3adda6 |
- fi
|
|
|
3adda6 |
|
|
|
3adda6 |
### handle cciss sysfs naming
|
|
|
3adda6 |
name=${name//!//}
|
|
|
3adda6 |
|
|
|
3adda6 |
### just return the possibly nonexisting name
|
|
|
3adda6 |
echo "/dev/$name"
|
|
|
3adda6 |
+ [[ -r "/dev/$name" ]] && return 0
|
|
|
3adda6 |
return 1
|
|
|
3adda6 |
}
|
|
|
3adda6 |
|
|
|
3adda6 |
diff --git a/usr/share/rear/rescue/GNU/Linux/270_fc_transport_info.sh b/usr/share/rear/rescue/GNU/Linux/270_fc_transport_info.sh
|
|
|
3adda6 |
index 0de4f60b..64276dfe 100644
|
|
|
3adda6 |
--- a/usr/share/rear/rescue/GNU/Linux/270_fc_transport_info.sh
|
|
|
3adda6 |
+++ b/usr/share/rear/rescue/GNU/Linux/270_fc_transport_info.sh
|
|
|
3adda6 |
@@ -1,3 +1,6 @@
|
|
|
3adda6 |
+# don't collect this anymore, this can be very slow
|
|
|
3adda6 |
+return 0
|
|
|
3adda6 |
+
|
|
|
3adda6 |
# collect output from production SAN disks
|
|
|
3adda6 |
|
|
|
3adda6 |
find /sys/class/fc_transport -follow -maxdepth 6 \( -name model -o -name vendor -o -name rev -name state -o -name model_name -o -name size -o -name node_name \) 2>/dev/null| egrep -v 'driver|rport|power|drivers|devices' | xargs grep '.' > $VAR_DIR/recovery/fc_transport.info >&2
|