X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=functions.sh;h=8e2b34c07d5efb3ed1861d3e9edc43efbcf8b160;hb=327c21cdf7408afb43afb62b6cc7dda9806a540d;hp=bc78bfbbd941089a855ed841511b7f5bd9cede65;hpb=a57f3edd1fd261978e7d62b84f73a8177fbeabd6;p=xodist

diff --git a/functions.sh b/functions.sh
index bc78bfb..8e2b34c 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # Copyright © 2008  Andres Salomon <dilinger@queued.net>
 #
@@ -28,76 +28,12 @@ check_for_cmds()
 	return 0
 }
 
-# @mntpt - path to mounted root directory
-# @fstype - the root filesystem type (in a form that 'mount' understands)
-create_fstab()
+start_logging()
 {
-	mntpt="$1"
-	fstype="$2"
-
-	if [ "${fstype}" = "jffs2" ]; then
-		r=mtd0
-	else
-		r="LABEL=OLPCRoot"
-	fi
-
-	cat >${mntpt}/etc/fstab<<EOF
-${r} / ${fstype} defaults,noatime 1 1
-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
-none /ofw promfs defaults 0 0
-tmpfs /var/cache/apt/cache tmpfs defaults 0 0
-EOF
-}
-
-# @mntpt - path to mounted root directory
-# @fstype - the root filesystem type (in a form that 'mount' understands)
-create_ofwboot()
-{
-	mntpt="$1"
-	fstype="$2"
-
-	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
-\\ OLPC boot script
-
-" ro root=${r} ${rfs} video=lxfb fbcon=font:SUN12x22" to boot-file
-game-key-mask h# 80 and if
-	\\ boot from backup kernel
-	" ${dev}:\\vmlinuz.old" to boot-device
-	" ${dev}:\\initrd.img.old" to ramdisk
-else
-	\\ boot from regular kernel
-	" ${dev}:\\vmlinuz" to boot-device
-	" ${dev}:\\initrd.img" to ramdisk
-then
-boot
-EOF
-}
-
-chroot_internal_mounts()
-{
-    root_dir="$1"
-    mount -t proc proc ${root_dir}/proc
-    mount -t devpts devpts ${root_dir}/dev/pts
-    mount -t tmpfs tmpfs ${root_dir}/var/cache/apt/cache
-}
-
-chroot_internal_umounts()
-{
-    root_dir="$1"
-    umount ${root_dir}/proc
-    umount ${root_dir}/dev/pts
-    umount ${root_dir}/var/cache/apt/cache
+    logpipe="$1".pipe
+    trap "rm -f $logpipe" 0
+    mknod $logpipe p
+    tee "$1".log <$logpipe &
+    trap "kill $!; rm -f $logpipe" 0
+    exec >$logpipe 2>&1
 }