Adding upstream version 3.0~a20.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index 23d0bbc..82f5413 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1590,7 +1590,7 @@ check_dev ()
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
-                               echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+                               echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
                        fi
                fi
        fi
@@ -1612,6 +1612,35 @@ check_dev ()
                        umount $mountpoint
                fi
        fi
+
+       IFS=","
+       for device in ${devname}
+       do
+               case "$device" in
+                       *mapper*)
+                               # Adding lvm support
+                               if [ -x /scripts/local-top/lvm2 ]
+                               then
+                                       ROOT="$device" resume="" /scripts/local-top/lvm2
+                               fi
+                               ;;
+
+                       /dev/md*)
+                               # Adding raid support
+                               if [ -x /scripts/local-top/mdadm ]
+                               then
+                                       cp /conf/conf.d/md /conf/conf.d/md.orig
+                                       echo "MD_DEVS=$device " >> /conf/conf.d/md
+                                       /scripts/local-top/mdadm
+                                       mv /conf/conf.d/md.orig /conf/conf.d/md
+                               fi
+                               ;;
+               esac
+       done
+       unset IFS
+
+       [ -n "$device" ] && devname="$device"
+
        [ -e "$devname" ] || continue
 
        if [ -n "${LIVE_MEDIA_OFFSET}" ]