summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-01-19 10:59:26 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-01-19 10:59:26 +0000
commit7f4a312e3521af3de82765d1036798158c103f8d (patch)
tree8ebdc2c6e40cf779493756b0aa6d97700fe50876 /pkgs/build-support
parentba233767187878759d779da281c9baf8bc86272d (diff)
downloadnixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.tar
nixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.tar.gz
nixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.tar.bz2
nixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.tar.lz
nixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.tar.xz
nixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.tar.zst
nixpkgs-7f4a312e3521af3de82765d1036798158c103f8d.zip
* Handle FreeBSD filesystems.
svn path=/nixpkgs/trunk/; revision=25624
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/vm/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 3d8d756e977..9f68947def4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -352,12 +352,14 @@ rec {
         ${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/
       '';
     });