A workaround to make sure /dev/mtd0 can be created

[live-boot-grml.git] / components / 9990-main.sh

diff --git a/components/9990-main.sh b/components/9990-main.sh
index bab0bd7..530cd3b 100755 (executable)
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -57,8 +57,19 @@ Live ()
                                if [ $? -eq 0 ]
                                then
                                        # We found a memdisk, set up phram
-                                       modprobe phram phram=memdisk,${MEMDISK}
-                                       modprobe phram phram=memdisk,${MEMDISK}
+                                       # Sometimes "modprobe phram" can not successfully create /dev/mtd0.
+                                       # Have to try several times.
+                                       max_try=20
+                                       while [ ! -c /dev/mtd0 -a "$max_try" -gt 0 ]; do
+                                         modprobe phram phram=memdisk,${MEMDISK}
+                                         sleep 0.2
+                                         if [ -c /dev/mtd0 ]; then
+                                               break
+                                         else
+                                               rmmod phram
+                                         fi
+                                         max_try=$((max_try - 1))
+                                       done
 
                                        # Load mtdblock, the memdisk will be /dev/mtdblock0
                                        modprobe mtdblock
@@ -111,10 +122,10 @@ Live ()
        then
                losetup -d /dev/loop0
 
-               if is_mountpoint /live/fromiso
+               if is_mountpoint /run/live/fromiso
                then
-                       umount /live/fromiso
-                       rmdir --ignore-fail-on-non-empty /live/fromiso \
+                       umount /run/live/fromiso
+                       rmdir --ignore-fail-on-non-empty /run/live/fromiso \
                                >/dev/null 2>&1 || true
                fi
        fi
@@ -174,6 +185,13 @@ Live ()
                panic "A wrong rootfs was mounted."
        fi
 
+       # avoid breaking existing user scripts that rely on the old path
+       # this includes code that checks what is mounted on /lib/live/mount/*
+       # (eg: grep /lib/live /proc/mount)
+       # XXX: to be removed before the bullseye release
+       mkdir -p ${rootmnt}/lib/live/mount
+       mount --rbind /run/live ${rootmnt}/lib/live/mount
+
        Fstab
        Netbase
 
@@ -182,5 +200,7 @@ Live ()
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}
-       [ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && cp boot.log "${rootmnt}/var/log/live" 2>/dev/null
+       [ -w "${rootmnt}/var/log/" ] && mkdir -p "${rootmnt}/var/log/live" && ( \
+                               cp boot.log "${rootmnt}/var/log/live" 2>/dev/null; \
+                               cp fsck.log "${rootmnt}/var/log/live" 2>/dev/null )
 }