JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #145641 from poelzi/fix-ceph

Browse Source 
[ceph-client] Install cephfs client tools as well
This commit is contained in:
Jörg Thalheim 2021-11-12 17:20:30 +00:00 committed by GitHub
commit 1e3ec4c2ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/ceph/default.nix
View File

@ -239,12 +239,14 @@ in rec {
}; };
ceph-client = runCommand "ceph-client-${version}" { ceph-client = runCommand "ceph-client-${version}" {
meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices"; meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs";
} '' } ''
mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions} mkdir -p $out/{bin,sbin,etc,${sitePackages},share/bash-completion/completions}
cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
cp -r ${ceph}/bin/rbd-replay* $out/bin cp -r ${ceph}/bin/rbd-replay* $out/bin
cp -r ${ceph}/sbin/mount.ceph $out/sbin
cp -r ${ceph}/sbin/mount.fuse.ceph $out/sbin
cp -r ${ceph}/${sitePackages} $out/${sitePackages} cp -r ${ceph}/${sitePackages} $out/${sitePackages}
cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions
# wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths