]>
Commit | Line | Data |
---|---|---|
93745c00 AM |
1 | Index: mod-md.sh |
2 | =================================================================== | |
3 | --- mod-md.sh (wersja 11336) | |
4 | +++ mod-md.sh (kopia robocza) | |
5 | @@ -10,9 +10,13 @@ | |
6 | # @access public | |
7 | setup_mod_md() { | |
8 | mdassemble=$(find_tool $initrd_dir/mdassemble /sbin/initrd-mdassemble) | |
9 | - if [ ! -x /sbin/mdadm ] || [ ! -x "$mdassemble" ]; then | |
10 | + if [ ! -x "$mdassemble" ]; then | |
11 | USE_MD=no | |
12 | fi | |
13 | + mdadm=$(find_tool /sbin/mdadm $initrd_dir/mdadm /sbin/initrd-mdadm) | |
14 | + if [ ! -x "$mdadm" ]; then | |
15 | + USE_MD=no | |
16 | + fi | |
17 | } | |
18 | ||
19 | # return true if mdadm is set on $devpath | |
20 | @@ -42,7 +46,7 @@ | |
21 | ||
22 | if [ -f /etc/mdadm.conf ]; then | |
23 | debug "Finding RAID details using mdadm for rootdev=$1" | |
24 | - eval `(/sbin/mdadm -v --examine --scan --config=/etc/mdadm.conf 2> /dev/null;/sbin/mdadm -v --detail --scan --config=/etc/mdadm.conf 2> /dev/null) | awk -v rootdev="$1" ' | |
25 | + eval `($mdadm -v --examine --scan --config=/etc/mdadm.conf 2> /dev/null;$mdadm -v --detail --scan --config=/etc/mdadm.conf 2> /dev/null) | awk -v rootdev="$1" ' | |
26 | BEGIN { | |
27 | found = "no"; | |
28 | dev_list = ""; | |
29 | @@ -143,7 +147,7 @@ | |
30 | ||
31 | echo "DEVICE $cr_dev_list" >> "$DESTDIR/etc/mdadm.conf" | |
32 | cr_dev_list_md="$(echo "$cr_dev_list" | xargs | awk ' { gsub(/ +/,",",$0); print $0; }')" | |
33 | - cr_md_conf=$(/sbin/mdadm --detail --brief --config=/etc/mdadm.conf $cr_rootdev | awk ' { gsub(/spares=[0-9]+/, "", $0); print $0; }') | |
34 | + cr_md_conf=$($mdadm --detail --brief --config=/etc/mdadm.conf $cr_rootdev | awk ' { gsub(/spares=[0-9]+/, "", $0); print $0; }') | |
35 | if [ -n "$cr_md_conf" ]; then | |
36 | echo "$cr_md_conf" >> "$DESTDIR/etc/mdadm.conf" | |
37 | else |