]>
Commit | Line | Data |
---|---|---|
a72fc9ce ER |
1 | Index: geninitrd |
2 | =================================================================== | |
3 | --- geninitrd (.../tags/6894) (revision 6997) | |
4 | +++ geninitrd (.../trunk) (revision 6997) | |
5 | @@ -355,7 +355,7 @@ | |
6 | getline x; | |
7 | if (x ~ /devices=/) { | |
8 | dev_list = x; | |
9 | - gsub("devices=", NUL, dev_list); | |
10 | + gsub(".*devices=", NUL, dev_list); | |
11 | gsub(",", " ", dev_list); | |
12 | } | |
13 | } | |
14 | @@ -1197,6 +1197,8 @@ | |
15 | mkdir -p $MNTIMAGE/dev/mapper | |
16 | mknod $MNTIMAGE/dev/mapper/control c 10 63 | |
17 | for device in $PVDEVICES; do | |
18 | + # if LVM on RAID then device might be copied already in gen_softraid | |
19 | + [ -e "$MNTIMAGE/dev/$(basename $device)" ] && continue | |
20 | cp -HR $device $MNTIMAGE/dev/ | |
21 | done | |
22 | fi |