summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorUwe Stuehler <uwe@cvs.openbsd.org>2006-04-04 00:25:59 +0000
committerUwe Stuehler <uwe@cvs.openbsd.org>2006-04-04 00:25:59 +0000
commit639f2a0aa470617a5220d0196e209e5d0602047f (patch)
tree7932089db7e1ea805b4e86a26eaf642451c79be0 /distrib
parentef5a7cbf973c75ddd5c294867d6f4c5de52a8e9d (diff)
Some hacks for the C3200. Files have to be moved and copied around to make
room in the root filessystem and to avoid a known problem with zbsdmod.
Diffstat (limited to 'distrib')
-rw-r--r--distrib/zaurus/ipk/bootbsd5
-rw-r--r--distrib/zaurus/ipk/postinst23
-rw-r--r--distrib/zaurus/ipk/postrm8
3 files changed, 30 insertions, 6 deletions
diff --git a/distrib/zaurus/ipk/bootbsd b/distrib/zaurus/ipk/bootbsd
index ce59306cf3f..e4296037256 100644
--- a/distrib/zaurus/ipk/bootbsd
+++ b/distrib/zaurus/ipk/bootbsd
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: bootbsd,v 1.2 2005/07/12 06:31:53 uwe Exp $
+# $OpenBSD: bootbsd,v 1.3 2006/04/04 00:25:58 uwe Exp $
#
# Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
#
@@ -15,4 +15,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
+if [ -s /hdd2/bsd.rd ]; then
+ cp /hdd2/bsd.rd /proc/zboot
+fi
cp /usr/local/OpenBSD/bsd.rd /proc/zboot
diff --git a/distrib/zaurus/ipk/postinst b/distrib/zaurus/ipk/postinst
index 680ce5e86f2..002638437ef 100644
--- a/distrib/zaurus/ipk/postinst
+++ b/distrib/zaurus/ipk/postinst
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: postinst,v 1.5 2005/07/18 00:15:59 uwe Exp $
+# $OpenBSD: postinst,v 1.6 2006/04/04 00:25:58 uwe Exp $
#
# Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
#
@@ -22,13 +22,28 @@ rmmod zbsdmod 2>/dev/null
mount -o remount,rw /
-# The C3100 has a 32M root filesystem, but it's full.
-rootsz=`df -k / | awk 'NR==2{print $2}'` || exit $?
+# The C3100/C3200 models have a 32M root filesystem in NAND flash,
+# but it is completely full. Move things around to make some room.
+rootsz=`df -k / | awk 'NR==2{print $2}'`
if [ ${rootsz:-0} -ge 32768 ]; then
- # Make some room by moving this large dictionary.
if [ -f /usr/QtPalmtop.rom/etc/kanwadict ]; then
+ # C3100
rm -f /home/QtPalmtop/etc/kanwadict
mv /usr/QtPalmtop.rom/etc/kanwadict /home/QtPalmtop/etc/kanwadict
+ else
+ # C3200
+ if [ -L /home/QtPalmtop/etc/speech -a \
+ -d /usr/QtPalmtop.rom/etc/speech ]; then
+ rm -f /home/QtPalmtop/etc/speech
+ mv /usr/QtPalmtop.rom/etc/speech /home/QtPalmtop/etc
+ ln -s /home/QtPalmtop/etc/speech /usr/QtPalmtop.rom/etc
+ fi
+ # Copying bsd.rd onto a disk partition significantly
+ # increases the chance that zbsdmod.o can boot it.
+ hddsz=`df -k /hdd2 | awk 'NR==2{print $4}'`
+ if [ ${hddsz:-0} -ge 5120 ]; then
+ cp /usr/local/OpenBSD/bsd.rd /hdd2
+ fi
fi
fi
diff --git a/distrib/zaurus/ipk/postrm b/distrib/zaurus/ipk/postrm
index 181bc573579..b69593f73f3 100644
--- a/distrib/zaurus/ipk/postrm
+++ b/distrib/zaurus/ipk/postrm
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: postrm,v 1.3 2005/07/12 06:31:53 uwe Exp $
+# $OpenBSD: postrm,v 1.4 2006/04/04 00:25:58 uwe Exp $
#
# Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
#
@@ -31,4 +31,10 @@ rm -f /root/etc/rc.d/zbsdmod.o
# mv -f /root/etc/rc.d/rc.rofilesys.openbsd /root/etc/rc.d/rc.rofilesys
#fi
+# There is a chance that this file has not been installed by the
+# postinst script, but what does it matter...
+if [ -s /hdd2/bsd.rd ]; then
+ rm -f /hdd2/bsd.rd
+fi
+
mount -o remount,ro /