Author: eelco
Date: Wed Jan 19 10:59:26 2011
New Revision: 25624
URL: https://svn.nixos.org/websvn/nix/?rev=25624&sc=1

Log:
* Handle FreeBSD filesystems.

Modified:
   nixpkgs/trunk/pkgs/build-support/vm/default.nix

Modified: nixpkgs/trunk/pkgs/build-support/vm/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/vm/default.nix     Wed Jan 19 10:50:52 
2011        (r25623)
+++ nixpkgs/trunk/pkgs/build-support/vm/default.nix     Wed Jan 19 10:59:26 
2011        (r25624)
@@ -352,12 +352,14 @@
         ${module_init_tools}/sbin/modprobe loop
         ${module_init_tools}/sbin/modprobe ext4
         ${module_init_tools}/sbin/modprobe iso9660
+        ${module_init_tools}/sbin/modprobe ufs
         mknod /dev/loop0 b 7 0
 
         ensureDir $out
         ensureDir tmp
-        mount -o loop ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp
-        cp -R tmp/* $out/
+        mount -o loop,ro,ufstype=44bsd ${lib.optionalString (fs != null) "-t 
${fs} "}${file} tmp ||
+          mount -o loop,ro ${lib.optionalString (fs != null) "-t ${fs} 
"}${file} tmp
+        cp -Rv tmp/* $out/
       '';
     });
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to