[pkgsrc/trunk]: pkgsrc/bootstrap If creating a disk image on Darwin 7.0 or ne...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4888939e8a5
branches:  trunk
changeset: 518053:d4888939e8a5
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Aug 30 04:36:10 2006 +0000

description:
If creating a disk image on Darwin 7.0 or newer, create a case-sensitive
HFS+ rather than a UFS. The result performs better, among other things.

diffstat:

 bootstrap/darwindiskimage |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r 64b6e7f47b82 -r d4888939e8a5 bootstrap/darwindiskimage
--- a/bootstrap/darwindiskimage Wed Aug 30 04:30:53 2006 +0000
+++ b/bootstrap/darwindiskimage Wed Aug 30 04:36:10 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: darwindiskimage,v 1.1 2006/08/30 04:29:53 schmonz Exp $
+# $NetBSD: darwindiskimage,v 1.2 2006/08/30 04:36:10 schmonz Exp $
 
 _getdevice_and_halfway_mount()
 {
@@ -19,28 +19,31 @@
 
 dmg_create()
 {
-       local file mountedname megabytes device
+       local fstype fs osmajor file mountedname megabytes device
        [ $# -eq 2 ] || die 1 "Usage: $0 create <file> <megabytes>"
 
+       # Use case-sensitive HFS+ where available (Darwin >= 7)
+       fstype='Apple_UFS'
+       fs='UFS'
+       osmajor=`uname -r | awk 'BEGIN {FS="."} {print $1}'`
+       if [ ${osmajor} -ge 7 ]; then
+               fstype='Apple_HFSX'
+               fs='HFSX'
+       fi
+
        file="`_normalize_filename \"$1\"`"
        mountedname="`basename \"${file}\" .dmg`"
        megabytes=$2
 
        # create
        hdiutil create -quiet "${file}" -megabytes ${megabytes} \
-               -partitionType Apple_UFS -layout SPUD
-
-       # format
-       device=`_getdevice_and_halfway_mount "${file}"`
-       newfs ${device}
-       hdiutil eject -quiet "${device}"
+               -partitionType ${fstype} -layout SPUD -fs ${fs}
 
        # rename
+       device=`_getdevice_and_halfway_mount "${file}"`
        hdiutil mount "${file}"
        disktool -n "${device}" "${mountedname}"
        hdiutil eject -quiet "${device}"
-       # mountpoint="`hdiutil mount -verbose '${file}' | grep -A 1 '<key>mount-point</key>' | grep -v '<key>mount-point</key>' | sed -e 's|<string>||' -e 's|</string>||' | awk '{print $1}'`"
-       # mount | grep '^/dev/disk1' | awk '{print $3}' | sed -e 's|^/Volumes/||'
 }
 
 dmg_mount()