mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-12 15:14:13 +00:00
stratisd: use --replace-fail flag on substitute{,InPlace}
This commit is contained in:
parent
eba8b5d8b2
commit
5c773ed76d
@ -43,14 +43,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace udev/61-stratisd.rules \
|
||||
--replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
|
||||
--replace stratis-str-cmp "$out/lib/udev/stratis-str-cmp"
|
||||
--replace-fail stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
|
||||
--replace-fail stratis-str-cmp "$out/lib/udev/stratis-str-cmp"
|
||||
|
||||
substituteInPlace systemd/stratis-fstab-setup \
|
||||
--replace stratis-min "$out/bin/stratis-min" \
|
||||
--replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \
|
||||
--replace sleep "${coreutils}/bin/sleep" \
|
||||
--replace udevadm "${systemd}/bin/udevadm"
|
||||
--replace-fail stratis-min "$out/bin/stratis-min" \
|
||||
--replace-fail systemd-ask-password "${systemd}/bin/systemd-ask-password" \
|
||||
--replace-fail sleep "${coreutils}/bin/sleep" \
|
||||
--replace-fail udevadm "${systemd}/bin/udevadm"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p "$initrd/lib/systemd/system"
|
||||
substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \
|
||||
"$initrd/lib/systemd/system/stratisd-min.service" \
|
||||
--replace mkdir "${coreutils}/bin/mkdir"
|
||||
--replace-fail mkdir "${coreutils}/bin/mkdir"
|
||||
mkdir -p "$initrd/lib/udev/rules.d"
|
||||
cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d"
|
||||
rm -r "$out/lib/dracut"
|
||||
|
Loading…
Reference in New Issue
Block a user