[llvm-commits] [zorg] r105822 - /zorg/trunk/zorg/buildbot/builders/ChrootSetup.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jun 11 12:32:40 2010
New Revision: 105822

URL: http://llvm.org/viewvc/llvm-project?rev=105822&view=rev
Log:
buildbot/ChrootSetup: Mount images with -readonly and make sure to create /dev/
mount point.

Modified:
    zorg/trunk/zorg/buildbot/builders/ChrootSetup.py

Modified: zorg/trunk/zorg/buildbot/builders/ChrootSetup.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ChrootSetup.py?rev=105822&r1=105821&r2=105822&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ChrootSetup.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ChrootSetup.py Fri Jun 11 12:32:40 2010
@@ -44,7 +44,8 @@
         # Setup the build root we will build projects in.
         f.addStep(ShellCommand(
                 name="attach.buildroot",
-                command=("hdiutil attach -noverify -plist -mountrandom . %s | "
+                command=("hdiutil attach -readonly -noverify "
+                         "-plist -mountrandom . %s | "
                          "tee mount_info.plist") % image,
                 description="attach build root image",
                 haltOnFailure=True,
@@ -109,6 +110,11 @@
                            workdir=build_root_name))
 
     # Initialize /dev/.
+    f.addStep(ShellCommand(name="chroot.init.mkdir.dev",
+                           command=["sudo", "mkdir", "-p", "dev"],
+                           haltOnFailure=True,
+                           description="mkdir /dev",
+                           workdir=build_root_name))
     f.addStep(ShellCommand(name="chroot.init.mount.devfs",
                            command=["sudo", "mount", "-t", "devfs",
                                     "devfs", "dev"],