From 5740226f88f501dbb3d25abf4b865c70b7705da7 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 23 Apr 2016 18:24:18 +0200 Subject: [PATCH] Revert "Merge pull request #14926 from grahamc/graceful-facetimehd-module-unload-16.03" This reverts commit 71916459a325703621f7cb05f24f167c5c54fde2, reversing changes made to 9d1662c6c90059b63fad01b3f55a0df94af7cde4. I noticed too late that this does not use kmod, like its counterpart on master. See https://github.com/NixOS/nixpkgs/issues/14885 --- nixos/modules/hardware/video/webcam/facetimehd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix index ab8cd664683f..b35709763b90 100644 --- a/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -31,7 +31,7 @@ in # unload module during suspend/hibernate as it crashes the whole system powerManagement.powerDownCommands = '' - ${pkgs.module_init_tools}/bin/lsmod | ${pkgs.gnugrep}/bin/grep -q "^facetimehd" && ${pkgs.module_init_tools}/bin/rmmod -f -v facetimehd + ${pkgs.module_init_tools}/bin/rmmod -f facetimehd ''; # and load it back on resume