[57712] users/ryandesign/minivmac

[ryandesign at macports.org]

Revision: 57712
          http://trac.macports.org/changeset/57712
Author:   ryandesign at macports.org
Date:     2009-09-15 07:16:34 -0700 (Tue, 15 Sep 2009)
Log Message:
-----------
minivmac: remove the ability to mount a disk image in read/write mode, since this is not possible as of Snow Leopard and the port no longer uses this feature

Modified Paths:
--------------
    users/ryandesign/minivmac/Portfile
    users/ryandesign/minivmac/files/attach.exp

Modified: users/ryandesign/minivmac/Portfile
===================================================================
--- users/ryandesign/minivmac/Portfile	2009-09-15 14:10:49 UTC (rev 57711)
+++ users/ryandesign/minivmac/Portfile	2009-09-15 14:16:34 UTC (rev 57712)
@@ -125,7 +125,7 @@
     ln -s ${my_appdir}/${romfile} ${my_mnvm_dat}
     
     # Copy the Disk Tools image from the container image.
-    set my_system_disk_container_mount [my_attach_disk_image ${workpath}/${my_system_disk_container} 0]
+    set my_system_disk_container_mount [my_attach_disk_image ${workpath}/${my_system_disk_container}]
     file copy "${my_system_disk_container_mount}/Disk Tools.image" "${workpath}/Disk Tools.dsk"
     my_detach_disk_image ${my_system_disk_container_mount}
     
@@ -158,7 +158,7 @@
 post-configure {
     # Get the build product.
     set my_variation [my_get_variation]
-    set my_src_disk_mount [my_attach_disk_image ${workpath}/${my_src}/${my_src}.img 0]
+    set my_src_disk_mount [my_attach_disk_image ${workpath}/${my_src}/${my_src}.img]
     if {[file exists ${my_src_disk_mount}/output/${my_variation}]} {
         file copy ${my_src_disk_mount}/output/${my_variation} ${workpath}
     }
@@ -216,12 +216,12 @@
     set romfile_model "Macintosh SE"
 }
 
-proc my_attach_disk_image {disk_image allow_writing} {
+proc my_attach_disk_image {disk_image} {
     global name workpath
     set mountpoint [exec mktemp -d -q -t ${name}]
     # Use this expect script instead of using hdiutil directly, because the
     # system disk image has a license agreement we must agree to.
-    my_system "${workpath}/attach.exp '${disk_image}' '${mountpoint}' '${allow_writing}'"
+    my_system "${workpath}/attach.exp '${disk_image}' '${mountpoint}'"
     return ${mountpoint}
 }
 

Modified: users/ryandesign/minivmac/files/attach.exp
===================================================================
--- users/ryandesign/minivmac/files/attach.exp	2009-09-15 14:10:49 UTC (rev 57711)
+++ users/ryandesign/minivmac/files/attach.exp	2009-09-15 14:16:34 UTC (rev 57712)
@@ -1,13 +1,7 @@
 #!/usr/bin/env expect --
 
-if {[lindex $argv 2]} {
-	set flag "-readwrite"
-} else {
-	set flag "-readonly"
-}
+spawn hdiutil attach "[lindex $argv 0]" -mountpoint "[lindex $argv 1]" -private -nobrowse -noautoopen -noautofsck -noverify -readonly
 
-spawn hdiutil attach "[lindex $argv 0]" -mountpoint "[lindex $argv 1]" -private -nobrowse -noautoopen -noautofsck -noverify $flag
-
 expect {
 	"Software License" {
 		exp_send "q"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090915/8e4628ed/attachment.html>