[darwinbuild-changes] [347] trunk/darwinbuild/darwinbuild

[source_changes at macosforge.org]

Revision: 347
          http://trac.macosforge.org/projects/darwinbuild/changeset/347
Author:   kvv at apple.com
Date:     2007-11-08 14:25:59 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
volfs is no longer present on Leopard

Modified Paths:
--------------
    trunk/darwinbuild/darwinbuild

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2007-11-06 02:58:10 UTC (rev 346)
+++ trunk/darwinbuild/darwinbuild	2007-11-08 22:25:59 UTC (rev 347)
@@ -772,17 +772,22 @@
 		echo "devfs appears to exist ..."
 	fi
 
-	if [ -z "$(echo $BuildRoot/.vol/*)" ]; then
- 		echo "Mounting volfs ..."
- 		[ -d "$BuildRoot/sbin" ] || mkdir -p "$BuildRoot/sbin"
- 		[ -f "$BuildRoot/sbin/mount_volfs" ] || cp /sbin/mount_volfs "$BuildRoot/sbin/"
- 		[ -f "$BuildRoot/sbin/umount" ] || cp /sbin/umount "$BuildRoot/sbin/"
- 		[ -d "$BuildRoot/.vol" ] || mkdir -p "$BuildRoot/.vol"
- 		## If the directory is empty, assume volfs is not mounted
- 		chroot "$BuildRoot" /sbin/mount_volfs "/.vol"
-	else
-	    echo "volfs appears to be mounted ..."
- 	fi
+	if [ -x /sbin/mount_volfs ]; then
+		# volfs is no longer present (nor needed) on Leopard.
+		if [ -z "$(echo $BuildRoot/.vol/*)" ]; then
+ 			echo "Mounting volfs ..."
+ 			[ -d "$BuildRoot/sbin" ] || mkdir -p "$BuildRoot/sbin"
+ 			[ -x "$BuildRoot/sbin/mount_volfs" ] || \
+				cp /sbin/mount_volfs "$BuildRoot/sbin/"
+ 			[ -x "$BuildRoot/sbin/umount" ] || \
+				cp /sbin/umount "$BuildRoot/sbin/"
+ 			[ -d "$BuildRoot/.vol" ] || mkdir -p "$BuildRoot/.vol"
+ 			## If the directory is empty, assume volfs not mounted
+ 			chroot "$BuildRoot" /sbin/mount_volfs "/.vol"
+		else
+	    		echo "volfs appears to be mounted ..."
+		fi
+	fi
 
 	###
 	### Actually invoke the build tool here

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20071108/62ea2850/attachment.html