From 01854a850a7e62c6a4f1de7c4ca0f1c9d89841c8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 22 Apr 2016 10:40:57 +0300 Subject: [PATCH] treewide: Replace module_init_tools -> kmod The former is deprecated and doesn't handle compressed kernel modules, so all current usages of it are broken. --- .../hardware/video/webcam/facetimehd.nix | 4 +-- .../openafs-client/default.nix | 4 +-- nixos/modules/virtualisation/qemu-vm.nix | 10 +++---- pkgs/build-support/vm/default.nix | 28 +++++++++---------- .../os-specific/linux/pcmciautils/default.nix | 6 ++-- pkgs/os-specific/linux/pm-utils/default.nix | 4 +-- pkgs/tools/X11/bumblebee/default.nix | 6 ++-- pkgs/tools/misc/tlp/default.nix | 4 +-- .../network-manager/openconnect.nix | 4 +-- .../networking/network-manager/openvpn.nix | 4 +-- .../tools/networking/network-manager/vpnc.nix | 4 +-- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index b35709763b90..309cedca48ba 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -31,13 +31,13 @@ in # unload module during suspend/hibernate as it crashes the whole system powerManagement.powerDownCommands = '' - ${pkgs.module_init_tools}/bin/rmmod -f facetimehd + ${pkgs.kmod}/bin/rmmod -f facetimehd ''; # and load it back on resume powerManagement.resumeCommands = '' export MODULE_DIR=/run/current-system/kernel-modules/lib/modules - ${pkgs.module_init_tools}/bin/modprobe -v facetimehd + ${pkgs.kmod}/bin/modprobe -v facetimehd ''; }; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 7a44fc1ea5ec..61c66bb88357 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -80,7 +80,7 @@ in preStart = '' mkdir -p -m 0755 /afs mkdir -m 0700 -p ${cfg.cacheDirectory} - ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true + ${pkgs.kmod}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"} ''; @@ -92,7 +92,7 @@ in preStop = '' ${pkgs.utillinux}/bin/umount /afs ${openafsPkgs}/sbin/afsd -shutdown - ${pkgs.module_init_tools}/sbin/rmmod libafs + ${pkgs.kmod}/sbin/rmmod libafs ''; }; }; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 7dfbc38efee6..7269fae51945 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -149,11 +149,11 @@ let ${pkgs.mtools}/bin/mlabel -i /dev/vda2 ::boot # Mount /boot; load necessary modules first. - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true - ${pkgs.module_init_tools}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_cp437.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/nls/nls_iso8859-1.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/fat.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/fat/vfat.ko || true + ${pkgs.kmod}/sbin/insmod ${pkgs.linux}/lib/modules/*/kernel/fs/efivarfs/efivarfs.ko || true mkdir /boot mount /dev/vda2 /boot diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e670e1ef2258..2d33a1973469 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -329,14 +329,14 @@ rec { buildInputs = [ utillinux ]; buildCommand = '' ln -s ${linux}/lib /lib - ${module_init_tools}/bin/modprobe loop - ${module_init_tools}/bin/modprobe ext4 - ${module_init_tools}/bin/modprobe hfs - ${module_init_tools}/bin/modprobe hfsplus - ${module_init_tools}/bin/modprobe squashfs - ${module_init_tools}/bin/modprobe iso9660 - ${module_init_tools}/bin/modprobe ufs - ${module_init_tools}/bin/modprobe cramfs + ${kmod}/bin/modprobe loop + ${kmod}/bin/modprobe ext4 + ${kmod}/bin/modprobe hfs + ${kmod}/bin/modprobe hfsplus + ${kmod}/bin/modprobe squashfs + ${kmod}/bin/modprobe iso9660 + ${kmod}/bin/modprobe ufs + ${kmod}/bin/modprobe cramfs mknod /dev/loop0 b 7 0 mkdir -p $out @@ -355,12 +355,12 @@ rec { buildInputs = [ utillinux mtdutils ]; buildCommand = '' ln -s ${linux}/lib /lib - ${module_init_tools}/bin/modprobe mtd - ${module_init_tools}/bin/modprobe mtdram total_size=131072 - ${module_init_tools}/bin/modprobe mtdchar - ${module_init_tools}/bin/modprobe mtdblock - ${module_init_tools}/bin/modprobe jffs2 - ${module_init_tools}/bin/modprobe zlib + ${kmod}/bin/modprobe mtd + ${kmod}/bin/modprobe mtdram total_size=131072 + ${kmod}/bin/modprobe mtdchar + ${kmod}/bin/modprobe mtdblock + ${kmod}/bin/modprobe jffs2 + ${kmod}/bin/modprobe zlib mknod /dev/mtd0 c 90 0 mknod /dev/mtdblock0 b 31 0 diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index ce5814965efd..3e41df9465f9 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , yacc, flex -, sysfsutils, module_init_tools, udev +, sysfsutils, kmod, udev , firmware # Special pcmcia cards. , config # Special hardware (map memory & port & irq) , lib # used to generate postInstall script. @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3"; }; - buildInputs = [udev yacc sysfsutils module_init_tools flex]; + buildInputs = [udev yacc sysfsutils kmod flex]; patchPhase = '' sed -i " - s,/sbin/modprobe,${module_init_tools}&,; + s,/sbin/modprobe,${kmod}&,; s,/lib/udev/,$out/sbin/,; " udev/* # fix-color */ sed -i " diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index 19315ec2d0ba..cb74dc204a3c 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, coreutils, gnugrep, utillinux, module_init_tools +{ stdenv, fetchurl, coreutils, gnugrep, utillinux, kmod , procps, kbd, dbus_tools }: let binPath = stdenv.lib.makeBinPath - [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ]; + [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ]; sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"] [ procps ]; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index d1f2318d6d45..803fd0dd8504 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -18,7 +18,7 @@ { stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper , glib, libbsd -, libX11, libXext, xorgserver, xkbcomp, module_init_tools, xkeyboard_config, xf86videonouveau +, libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. @@ -43,7 +43,7 @@ let nvidiaLibs = lib.makeLibraryPath nvidia_x11s; - bbdPath = lib.makeBinPath [ module_init_tools xorgserver ]; + bbdPath = lib.makeBinPath [ kmod xorgserver ]; bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { # be in PATH, and thus no action for them is required. substituteInPlace src/module.c \ - --replace "/sbin/modinfo" "${module_init_tools}/sbin/modinfo" + --replace "/sbin/modinfo" "${kmod}/sbin/modinfo" # Don't use a special group, just reuse wheel. substituteInPlace configure \ diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index e20dc850008a..d290c9f9a5a7 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils -, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils +, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils , enableRDW ? false, networkmanager }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; paths = lib.makeBinPath - ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools + ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools x86_energy_perf_policy gawk gnugrep coreutils ] ++ lib.optional enableRDW networkmanager diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index 0009aaf6b440..6a93100fa105 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openconnect-service.c" \ --replace "/usr/sbin/openconnect" "${openconnect}/sbin/openconnect" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; postConfigure = '' diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index be0264571953..4b98600611e4 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-openvpn-service.c" \ --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" substituteInPlace "properties/auth-helpers.c" \ --replace "/sbin/openvpn" "${openvpn}/sbin/openvpn" ''; diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index 5f3ab00ebc43..64de5408c7e0 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret -, withGnome ? true, gnome3, procps, module_init_tools }: +, withGnome ? true, gnome3, procps, kmod }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "/sbin/sysctl" "${procps}/sbin/sysctl" substituteInPlace "src/nm-vpnc-service.c" \ --replace "/sbin/vpnc" "${vpnc}/sbin/vpnc" \ - --replace "/sbin/modprobe" "${module_init_tools}/sbin/modprobe" + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" ''; postConfigure = ''