# HG changeset patch # User Pascal Bellard # Date 1332498648 -3600 # Node ID 5b5f1cec34b48f11ff3752c60e661bdd891ff804 # Parent 4e3f09beb648c41db4f3c05282453dd3149893d5 init/raid: use raid1 for mirror diff -r 4e3f09beb648 -r 5b5f1cec34b4 init --- a/init Fri Mar 23 10:53:35 2012 +0100 +++ b/init Fri Mar 23 11:30:48 2012 +0100 @@ -78,7 +78,8 @@ case "$line" in *raid10*) modprobe raid10 ;; *raid0*) modprobe raid0 ;; - *raid1*) modprobe raid1 ;; + *raid1*|*mirror*) + modprobe raid1 ;; *raid[456]*) modprobe raid456 ;; esac done @@ -126,7 +127,8 @@ if grep -q mount= /proc/cmdline; then root="$(sed 's/.*mount=\([^ ]*\).*/\1/' < /proc/cmdline)" dev=$(blkid | grep $root | sed 's/:.*//;q') - echo "Mounting $dev ($root) ..." + [ "$dev" = "$root" ] || root="$dev ($root)" + echo "Mounting $root ..." if ! mount $dev /mnt; then if echo $dev | grep -q "/dev/sd"; then delay=`cat /sys/module/usb_storage/parameters/delay_use`