mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
kexec-tools: rename from kexectools to match the project name
This commit is contained in:
parent
5942b67b0c
commit
3677d4bc22
@ -50,7 +50,7 @@ in
|
||||
boot = {
|
||||
postBootCommands = ''
|
||||
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 \
|
||||
--reset-vga --console-vga \
|
||||
--command-line="init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexectools) {
|
||||
environment.systemPackages = [ pkgs.kexectools ];
|
||||
config = lib.mkIf (lib.meta.availableOn pkgs.stdenv.hostPlatform pkgs.kexec-tools) {
|
||||
environment.systemPackages = [ pkgs.kexec-tools ];
|
||||
|
||||
systemd.services.prepare-kexec =
|
||||
{ description = "Preparation for kexec";
|
||||
@ -10,7 +10,7 @@
|
||||
before = [ "systemd-kexec.service" ];
|
||||
unitConfig.DefaultDependencies = false;
|
||||
serviceConfig.Type = "oneshot";
|
||||
path = [ pkgs.kexectools ];
|
||||
path = [ pkgs.kexec-tools ];
|
||||
script =
|
||||
''
|
||||
# Don't load the current system profile if we already have a kernel loaded
|
||||
|
@ -53,8 +53,8 @@
|
||||
, libselinux
|
||||
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp
|
||||
, libseccomp
|
||||
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools
|
||||
, kexectools
|
||||
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools
|
||||
, kexec-tools
|
||||
, bashInteractive
|
||||
, libmicrohttpd
|
||||
|
||||
@ -308,7 +308,7 @@ stdenv.mkDerivation {
|
||||
++ lib.optionals withCompression [ bzip2 lz4 xz ]
|
||||
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
|
||||
++ lib.optional withEfi gnu-efi
|
||||
++ lib.optional withKexectools kexectools
|
||||
++ lib.optional withKexectools kexec-tools
|
||||
++ lib.optional withLibseccomp libseccomp
|
||||
++ lib.optional withNetworkd iptables
|
||||
++ lib.optional withPCRE2 pcre2
|
||||
|
@ -387,6 +387,7 @@ mapAliases ({
|
||||
keepassx-community = keepassxc; # added 2017-11
|
||||
keepassx-reboot = keepassx-community; # added 2017-02-01
|
||||
keepassx2-http = keepassx-reboot; # added 2016-10-17
|
||||
kexectools = kexec-tools; # added 2021-09-03
|
||||
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
|
||||
kicad-with-packages3d = kicad; # added 2019-11-25
|
||||
|
@ -6352,7 +6352,7 @@ with pkgs;
|
||||
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user