Module Name: src
Committed By: christos
Date: Tue Jan 15 20:55:01 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
now that we compute sizes correctly, reduce the extra to how much free space
we want.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/rpi.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.7 src/distrib/utils/embedded/conf/rpi.conf:1.8
--- src/distrib/utils/embedded/conf/rpi.conf:1.7 Mon Jan 14 22:56:20 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Tue Jan 15 15:55:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.7 2013/01/15 03:56:20 christos Exp $
+# $NetBSD: rpi.conf,v 1.8 2013/01/15 20:55:00 christos Exp $
# Raspberry PI customization script used by mkimage
#
image=$HOME/rpi.img
@@ -12,11 +12,11 @@ kerneldir=$src/sys/arch/evbarm/compile/R
specialdirs="/kern /proc"
swap=256
-extra=$(( 150 + 8 )) # cylinder groups ~150MB
+extra=8 # spare space
boot=112
init=8
-size=0
+size=0 # autocompute
msdosid=12
overhead=$(( ${swap} + ${extra} + ${init} + ${boot} ))
@@ -60,10 +60,10 @@ drivedata: 0
8 partitions:
# size offset fstype [fsize bsize cpg/sgs]
- a: ${asize} ${aoffset} 4.2BSD 2048 16384 0 #
- b: ${swapsize} ${swapoffset} swap #
- d: ${totalsize} 0 unused 0 0 #
- e: ${bootsize} ${bootoffset} MSDOS #
+ a: ${asize} ${aoffset} 4.2BSD ${fsize} ${bsize} 0 #
+ b: ${swapsize} ${swapoffset} swap #
+ d: ${totalsize} 0 unused 0 0 #
+ e: ${bootsize} ${bootoffset} MSDOS #
EOF
${sudo} disklabel -R ${vnddev} ${tmp}
${sudo} fdisk -f -u -0 -s ${msdosid}/${bootoffset}/${bootsize} -F ${image}