Sync Debian's live-boot 4.0~alpha19
[live-boot-grml.git] / debian / patches / 44_fix_mdadm_usage_for_findiso.patch
1 --- a/scripts/boot/9990-misc-helpers.sh
2 +++ b/scripts/boot/9990-misc-helpers.sh
3 @@ -202,7 +202,7 @@
4                                 # Adding lvm support
5                                 if [ -x /scripts/local-top/lvm2 ]
6                                 then
7 -                                       ROOT="$device" resume="" /scripts/local-top/lvm2
8 +                                       ROOT="$device" resume="" /scripts/local-top/lvm2 >>/boot.log
9                                 fi
10                                 ;;
11  
12 @@ -210,10 +210,10 @@
13                                 # Adding raid support
14                                 if [ -x /scripts/local-top/mdadm ]
15                                 then
16 -                                       cp /conf/conf.d/md /conf/conf.d/md.orig
17 +                                       [ -r /conf/conf.d/md ] && cp /conf/conf.d/md /conf/conf.d/md.orig
18                                         echo "MD_DEVS=$device " >> /conf/conf.d/md
19 -                                       /scripts/local-top/mdadm
20 -                                       mv /conf/conf.d/md.orig /conf/conf.d/md
21 +                                       /scripts/local-top/mdadm >>/boot.log
22 +                                       [ -r /conf/conf.d/md.orig ] && mv /conf/conf.d/md.orig /conf/conf.d/md
23                                 fi
24                                 ;;
25                 esac