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

stratisd: use --replace-fail flag on substitute{,InPlace}

Browse Source
This commit is contained in:
Nick Cao 2024-03-26 13:21:20 -04:00
parent eba8b5d8b2
commit 5c773ed76d
No known key found for this signature in database
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/filesystems/stratisd/default.nix
View File

@ -43,14 +43,14 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace udev/61-stratisd.rules \ substituteInPlace udev/61-stratisd.rules \
--replace stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \ --replace-fail stratis-base32-decode "$out/lib/udev/stratis-base32-decode" \
--replace stratis-str-cmp "$out/lib/udev/stratis-str-cmp" --replace-fail stratis-str-cmp "$out/lib/udev/stratis-str-cmp"
substituteInPlace systemd/stratis-fstab-setup \ substituteInPlace systemd/stratis-fstab-setup \
--replace stratis-min "$out/bin/stratis-min" \ --replace-fail stratis-min "$out/bin/stratis-min" \
--replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ --replace-fail systemd-ask-password "${systemd}/bin/systemd-ask-password" \
--replace sleep "${coreutils}/bin/sleep" \ --replace-fail sleep "${coreutils}/bin/sleep" \
--replace udevadm "${systemd}/bin/udevadm" --replace-fail udevadm "${systemd}/bin/udevadm"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
mkdir -p "$initrd/lib/systemd/system" mkdir -p "$initrd/lib/systemd/system"
substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \ substitute "$out/lib/dracut/modules.d/90stratis/stratisd-min.service" \
"$initrd/lib/systemd/system/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" mkdir -p "$initrd/lib/udev/rules.d"
cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d" cp udev/61-stratisd.rules "$initrd/lib/udev/rules.d"
rm -r "$out/lib/dracut" rm -r "$out/lib/dracut"