cloud-utils: 0.27 -> 0.29
We keep the existing hacks for growpart to work inside the initrd Fixes #15736 #17015
This commit is contained in:
parent
3d5a033c96
commit
2326c8de4d
|
@ -24,7 +24,7 @@ with lib;
|
||||||
copy_bin_and_libs ${pkgs.gnused}/bin/sed
|
copy_bin_and_libs ${pkgs.gnused}/bin/sed
|
||||||
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
|
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
|
||||||
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
|
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
|
||||||
cp -v ${pkgs.cloud-utils}/bin/growpart $out/bin/growpart
|
cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart
|
||||||
ln -s sed $out/bin/gnused
|
ln -s sed $out/bin/gnused
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -1,20 +1,25 @@
|
||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl, makeWrapper, gawk, gnused, utillinux }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "cloud-utils-0.27";
|
# NOTICE: if you bump this, make sure to run
|
||||||
|
# $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
|
||||||
|
name = "cloud-utils-0.29";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://launchpad.net/cloud-utils/trunk/0.27/+download/cloud-utils-0.27.tar.gz";
|
url = "https://launchpad.net/cloud-utils/trunk/0.29/+download/cloud-utils-0.29.tar.gz";
|
||||||
sha256 = "16shlmg36lidp614km41y6qk3xccil02f5n3r4wf6d1zr5n4v8vd";
|
sha256 = "0z15gs8gmpy5gqxl7yiyjj7a6s8iw44djj6axvbci627b9pvd8cy";
|
||||||
};
|
};
|
||||||
patches = [ ./growpart-util-linux-2.26.patch ];
|
buildInputs = [ makeWrapper ];
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
cp bin/growpart $out/bin/growpart
|
cp bin/growpart $out/bin/growpart
|
||||||
sed -i 's|awk|gawk|' $out/bin/growpart
|
sed -i 's|awk|gawk|' $out/bin/growpart
|
||||||
sed -i 's|sed|gnused|' $out/bin/growpart
|
sed -i 's|sed|gnused|' $out/bin/growpart
|
||||||
|
ln -s sed $out/bin/gnused
|
||||||
|
wrapProgram $out/bin/growpart --prefix PATH : "${stdenv.lib.makeBinPath [ gnused gawk utillinux ]}:$out/bin"
|
||||||
'';
|
'';
|
||||||
dontInstall = true;
|
dontInstall = true;
|
||||||
dontPatchShebangs = true;
|
dontPatchShebangs = true;
|
||||||
|
dontStrip = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = stdenv.lib.platforms.unix;
|
||||||
|
|
Loading…
Reference in a new issue