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

kexec-tools: rename from kexectools to match the project name

Browse Source
This commit is contained in:
Graham Christensen 2021-09-03 10:17:21 -04:00
parent 5942b67b0c
commit 3677d4bc22
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/crashdump.nix
View File

@ -50,7 +50,7 @@ in
boot = { boot = {
postBootCommands = '' postBootCommands = ''
echo "loading crashdump kernel..."; echo "loading crashdump kernel...";
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \ ${pkgs.kexec-tools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \ --initrd=/run/current-system/initrd \
--reset-vga --console-vga \ --reset-vga --console-vga \
--command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}" --command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"

6
nixos/modules/system/boot/kexec.nix
View File

@ -1,8 +1,8 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexectools) { config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {
environment.systemPackages = [ pkgs.kexectools ]; environment.systemPackages = [ pkgs.kexec-tools ];
systemd.services.prepare-kexec = systemd.services.prepare-kexec =
{ description = "Preparation for kexec"; { description = "Preparation for kexec";
@ -10,7 +10,7 @@
before = [ "systemd-kexec.service" ]; before = [ "systemd-kexec.service" ];
unitConfig.DefaultDependencies = false; unitConfig.DefaultDependencies = false;
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
path = [ pkgs.kexectools ]; path = [ pkgs.kexec-tools ];
script = script =
'' ''
# Don't load the current system profile if we already have a kernel loaded # Don't load the current system profile if we already have a kernel loaded

0
pkgs/os-specific/linux/kexectools/default.nix → pkgs/os-specific/linux/kexec-tools/default.nix
View File

6
pkgs/os-specific/linux/systemd/default.nix
View File

@ -53,8 +53,8 @@
, libselinux , libselinux
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp
, libseccomp , libseccomp
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools , withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools
, kexectools , kexec-tools
, bashInteractive , bashInteractive
, libmicrohttpd , libmicrohttpd
@ -308,7 +308,7 @@ stdenv.mkDerivation {
++ lib.optionals withCompression [ bzip2 lz4 xz ] ++ lib.optionals withCompression [ bzip2 lz4 xz ]
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi ++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools ++ lib.optional withKexectools kexec-tools
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables ++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2 ++ lib.optional withPCRE2 pcre2

1
pkgs/top-level/aliases.nix
View File

@ -387,6 +387,7 @@ mapAliases ({
keepassx-community = keepassxc; # added 2017-11 keepassx-community = keepassxc; # added 2017-11
keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx-reboot = keepassx-community; # added 2017-02-01
keepassx2-http = keepassx-reboot; # added 2016-10-17 keepassx2-http = keepassx-reboot; # added 2016-10-17
kexectools = kexec-tools; # added 2021-09-03
keybase-go = keybase; # added 2016-08-24 keybase-go = keybase; # added 2016-08-24
kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
kicad-with-packages3d = kicad; # added 2019-11-25 kicad-with-packages3d = kicad; # added 2019-11-25

2
pkgs/top-level/all-packages.nix
View File

@ -6352,7 +6352,7 @@ with pkgs;
keeperrl = callPackage ../games/keeperrl { }; keeperrl = callPackage ../games/keeperrl { };
kexectools = callPackage ../os-specific/linux/kexectools { }; kexec-tools = callPackage ../os-specific/linux/kexec-tools { };
keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;