lxd: fix sh not in path (#55073)

lxd: add bash to PATH
This commit is contained in:
Meghea Iulian 2019-02-04 10:19:14 +02:00 committed by markuskowa
parent 72677fa735
commit 76c0ebc710

View file

@ -3,6 +3,7 @@
, squashfsTools, iproute, iptables, ebtables, libcap, dqlite , squashfsTools, iproute, iptables, ebtables, libcap, dqlite
, sqlite-replication , sqlite-replication
, writeShellScriptBin, apparmor-profiles, apparmor-parser , writeShellScriptBin, apparmor-profiles, apparmor-parser
, bash
}: }:
buildGoPackage rec { buildGoPackage rec {
@ -30,8 +31,8 @@ buildGoPackage rec {
# binaries from test/ # binaries from test/
rm $bin/bin/{deps,macaroon-identity} rm $bin/bin/{deps,macaroon-identity}
wrapProgram $bin/bin/lxd --prefix PATH ":" ${stdenv.lib.makeBinPath [ wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash
(writeShellScriptBin "apparmor_parser" '' (writeShellScriptBin "apparmor_parser" ''
exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@"
'') '')