initchroot: add a workaround for #314334

[xodist] / functions.sh

diff --git a/functions.sh b/functions.sh
index 705c4c91f6dffde7fa7fc156d57521a627d69598..226b8b4fdb0c5df2337ce8e1605eedea77a34681 100644 (file)
--- a/functions.sh
+++ b/functions.sh
@@ -48,6 +48,7 @@ tmpfs /dev/shm tmpfs defaults,size=15% 0 0
 proc /proc proc defaults 0 0
 sysfs /sys sysfs defaults 0 0
 none /ofw promfs defaults 0 0
+tmpfs /var/cache/apt/cache tmpfs defaults 0 0
 EOF
 }
 
@@ -61,9 +62,11 @@ create_ofwboot()
        if [ "${fstype}" = "jffs2" ]; then
                r=mtd0
                rfs="rootfstype=jffs2"
+               dev=nand
        else
                r=/dev/sda1
                rfs=""
+               dev=disk
        fi
 
        cat >${mntpt}/boot/olpc.fth<<EOF
@@ -72,10 +75,10 @@ create_ofwboot()
 " ro root=${r} ${rfs} fbcon=font:SUN12x22" to boot-file
 game-key-mask h# 80 and if
        \\ boot from backup kernel
-       " nand:\\vmlinuz.old" to boot-device
+       " ${dev}:\\vmlinuz.old" to boot-device
 else
        \\ boot from regular kernel
-       " nand:\\vmlinuz" to boot-device
+       " ${dev}:\\vmlinuz" to boot-device
 then
 boot
 EOF