commit c3f278bfba45fb496b5cb136f6be0eeb4c0b6696 · pyrox.dev/nixpkgs

+52

pkgs/tools/virtualization/google-guest-configs/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, makeWrapper, substituteAll

     

       2
       2
       +
       , ipcalc, iproute2, util-linux, coreutils, ethtool, gnugrep, gnused, nvme-cli }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         pname = "google-guest-configs";

     

       6
       6
       +
         version = "20211116.00";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchFromGitHub {

     

       9
       9
       +
           owner = "GoogleCloudPlatform";

     

       10
       10
       +
           repo = "guest-configs";

     

       11
       11
       +
           rev = version;

     

       12
       12
       +
           sha256 = "sha256-0SRu6p/DsHNNI20mkXJitt/Ee5S2ooiy5hNmD+ndecM=";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         binDeps = lib.makeBinPath [ coreutils util-linux gnugrep gnused ethtool ipcalc iproute2 ];

     

       16
       16
       +
       

     

       17
       17
       +
         nativeBuildInputs = [ makeWrapper ];

     

       18
       18
       +
       

     

       19
       19
       +
         dontConfigure = true;

     

       20
       20
       +
         dontBuild = true;

     

       21
       21
       +
       

     

       22
       22
       +
         postPatch = ''

     

       23
       23
       +
           substitute ${./fix-paths.patch} fix-paths.patch \

     

       24
       24
       +
             --subst-var out \

     

       25
       25
       +
             --subst-var-by nvme "${nvme-cli}/bin/nvme" \

     

       26
       26
       +
             --subst-var-by sh "${stdenv.shell}" \

     

       27
       27
       +
             --subst-var-by umount "${util-linux}/bin/umount" \

     

       28
       28
       +
             --subst-var-by logger "${util-linux}/bin/logger"

     

       29
       29
       +
           patch -p1 < ./fix-paths.patch

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         installPhase = ''

     

       33
       33
       +
           mkdir -p $out/{bin,etc,lib}

     

       34
       34
       +
           cp -r src/etc/{modprobe.d,sysctl.d} $out/etc

     

       35
       35
       +
           cp -r src/lib/udev $out/lib

     

       36
       36
       +
           cp -r src/sbin/* $out/bin

     

       37
       37
       +
           cp -r src/usr/bin/* $out/bin

     

       38
       38
       +
       

     

       39
       39
       +
           for i in $out/bin/* $out/lib/udev/google_nvme_id; do

     

       40
       40
       +
             wrapProgram "$i" \

     

       41
       41
       +
               --prefix "PATH" ":" "$binDeps"

     

       42
       42
       +
           done

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           homepage = "https://github.com/GoogleCloudPlatform/guest-configs";

     

       47
       47
       +
           description = "Linux Guest Environment for Google Compute Engine";

     

       48
       48
       +
           license = licenses.asl20;

     

       49
       49
       +
           platforms = platforms.linux;

     

       50
       50
       +
           maintainers = with maintainers; [ abbradar ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+61

pkgs/tools/virtualization/google-guest-configs/fix-paths.patch

···

       1
       1
       +
       diff -ru3 source.old/src/lib/udev/google_nvme_id source.new/src/lib/udev/google_nvme_id

     

       2
       2
       +
       --- source.old/src/lib/udev/google_nvme_id	1970-01-01 03:00:01.000000000 +0300

     

       3
       3
       +
       +++ source.new/src/lib/udev/google_nvme_id	2022-02-05 13:30:00.986242869 +0300

     

       4
       4
       +
       @@ -17,7 +17,7 @@

     

       5
       5
       +
        # the metadata server

     

       6
       6
       +
        

     

       7
       7
       +
        # Locations of the script's dependencies

     

       8
       8
       +
       -readonly nvme_cli_bin=/usr/sbin/nvme

     

       9
       9
       +
       +readonly nvme_cli_bin=@nvme@

     

       10
       10
       +
        

     

       11
       11
       +
        # Bash regex to parse device paths and controller identification

     

       12
       12
       +
        readonly NAMESPACE_NUMBER_REGEX="/dev/nvme[[:digit:]]+n([[:digit:]]+).*"

     

       13
       13
       +
       diff -ru3 source.old/src/lib/udev/rules.d/64-gce-disk-removal.rules source.new/src/lib/udev/rules.d/64-gce-disk-removal.rules

     

       14
       14
       +
       --- source.old/src/lib/udev/rules.d/64-gce-disk-removal.rules	1970-01-01 03:00:01.000000000 +0300

     

       15
       15
       +
       +++ source.new/src/lib/udev/rules.d/64-gce-disk-removal.rules	2022-02-05 13:27:42.635300567 +0300

     

       16
       16
       +
       @@ -14,4 +14,4 @@

     

       17
       17
       +
        #

     

       18
       18
       +
        # When a disk is removed, unmount any remaining attached volumes.

     

       19
       19
       +
        

     

       20
       20
       +
       -ACTION=="remove", SUBSYSTEM=="block", KERNEL=="sd*|vd*|nvme*", RUN+="/bin/sh -c '/bin/umount -fl /dev/$name && /usr/bin/logger -p daemon.warn -s WARNING: hot-removed /dev/$name that was still mounted, data may have been corrupted'"

     

       21
       21
       +
       +ACTION=="remove", SUBSYSTEM=="block", KERNEL=="sd*|vd*|nvme*", RUN+="@sh@ -c '@umount@ -fl /dev/$name && @logger@ -p daemon.warn -s WARNING: hot-removed /dev/$name that was still mounted, data may have been corrupted'"

     

       22
       22
       +
       diff -ru3 source.old/src/lib/udev/rules.d/65-gce-disk-naming.rules source.new/src/lib/udev/rules.d/65-gce-disk-naming.rules

     

       23
       23
       +
       --- source.old/src/lib/udev/rules.d/65-gce-disk-naming.rules	1970-01-01 03:00:01.000000000 +0300

     

       24
       24
       +
       +++ source.new/src/lib/udev/rules.d/65-gce-disk-naming.rules	2022-02-05 13:27:05.053107964 +0300

     

       25
       25
       +
       @@ -21,11 +21,11 @@

     

       26
       26
       +
        KERNEL=="sd*|vd*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode"

     

       27
       27
       +
        

     

       28
       28
       +
        # NVME Local SSD naming

     

       29
       29
       +
       -KERNEL=="nvme*n*", ATTRS{model}=="nvme_card", PROGRAM="/bin/sh -c 'nsid=$$(echo %k|sed -re s/nvme[0-9]+n\([0-9]+\).\*/\\1/); echo $$((nsid-1))'", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-%c"

     

       30
       30
       +
       +KERNEL=="nvme*n*", ATTRS{model}=="nvme_card", PROGRAM="@sh@ -c 'nsid=$$(echo %k|sed -re s/nvme[0-9]+n\([0-9]+\).\*/\\1/); echo $$((nsid-1))'", ENV{ID_SERIAL_SHORT}="local-nvme-ssd-%c"

     

       31
       31
       +
        KERNEL=="nvme*", ATTRS{model}=="nvme_card", ENV{ID_SERIAL}="Google_EphemeralDisk_$env{ID_SERIAL_SHORT}"

     

       32
       32
       +
        

     

       33
       33
       +
        # NVME Persistent Disk Naming

     

       34
       34
       +
       -KERNEL=="nvme*n*", ATTRS{model}=="nvme_card-pd", IMPORT{program}="google_nvme_id -d $tempnode"

     

       35
       35
       +
       +KERNEL=="nvme*n*", ATTRS{model}=="nvme_card-pd", IMPORT{program}="@out@/lib/udev/google_nvme_id -d $tempnode"

     

       36
       36
       +
        

     

       37
       37
       +
        # Symlinks

     

       38
       38
       +
        KERNEL=="sd*|vd*|nvme*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/google-$env{ID_SERIAL_SHORT}"

     

       39
       39
       +
       diff -ru3 source.old/src/sbin/google-dhclient-script source.new/src/sbin/google-dhclient-script

     

       40
       40
       +
       --- source.old/src/sbin/google-dhclient-script	1970-01-01 03:00:01.000000000 +0300

     

       41
       41
       +
       +++ source.new/src/sbin/google-dhclient-script	2022-02-05 13:29:37.430058984 +0300

     

       42
       42
       +
       @@ -31,7 +31,6 @@

     

       43
       43
       +
        # This script is found in EL 7 and used to fix local routing in EL 6.

     

       44
       44
       +
        # ----------

     

       45
       45
       +
        

     

       46
       46
       +
       -PATH=/bin:/usr/bin:/sbin

     

       47
       47
       +
        # scripts in dhclient.d/ use $SAVEDIR (#833054)

     

       48
       48
       +
        SAVEDIR=/var/lib/dhclient

     

       49
       49
       +
        

     

       50
       50
       +
       @@ -58,9 +57,9 @@

     

       51
       51
       +
            if need_hostname; then

     

       52
       52
       +
                status=1

     

       53
       53
       +
                if [ -n "${new_ip_address}" ]; then

     

       54
       54
       +
       -            eval $(/bin/ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?")

     

       55
       55
       +
       +            eval $(ipcalc --silent --hostname ${new_ip_address} ; echo "status=$?")

     

       56
       56
       +
                elif [ -n "${new_ip6_address}" ]; then

     

       57
       57
       +
       -            eval $(/bin/ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?")

     

       58
       58
       +
       +            eval $(ipcalc --silent --hostname ${new_ip6_address} ; echo "status=$?")

     

       59
       59
       +
                fi

     

       60
       60
       +
        

     

       61
       61
       +
                if [ ${status} -eq 0 ]; then

pkgs/top-level/all-packages.nix

···

       6111
       6111
        
       

     

       6112
       6112
        
         google-guest-agent = callPackage ../tools/virtualization/google-guest-agent { };

     

       6113
       6113
        
       

     

       6114
       6114
       +
         google-guest-configs = callPackage ../tools/virtualization/google-guest-configs { };

     

       6115
       6115
       +
       

     

       6114
       6116
        
         gdown = with python3Packages; toPythonApplication gdown;

     

       6115
       6117
        
       

     

       6116
       6118
        
         gopro = callPackage ../tools/video/gopro { };