X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=functions.sh;h=5a45aa0df32937e1ca51cadf91440bfd111ef8a5;hb=44ba7f60c073767f5ea7c12fe83fc8de6df5fc0d;hp=00a23a4370d11dfd293b2a70274ad9934cd7e01b;hpb=d2cfda90cb27c7aac9d0956e71344142d2560228;p=xodist

diff --git a/functions.sh b/functions.sh
index 00a23a4..5a45aa0 100644
--- a/functions.sh
+++ b/functions.sh
@@ -47,7 +47,6 @@ devpts /dev/pts devpts gid=5,mode=620 0 0
 tmpfs /dev/shm tmpfs defaults,size=15% 0 0
 proc /proc proc defaults 0 0
 sysfs /sys sysfs defaults 0 0
-tmpfs /var/cache/apt/cache tmpfs defaults 0 0
 none /ofw promfs defaults 0 0
 EOF
 }
@@ -62,9 +61,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
@@ -73,10 +74,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