diff options
| author | Florian Friesdorf <flo@chaoflow.net> | 2011-10-13 13:05:58 +0000 |
|---|---|---|
| committer | Florian Friesdorf <flo@chaoflow.net> | 2011-10-13 13:05:58 +0000 |
| commit | 9d1255778313b9adc1a2f7f906aeb23a88377c82 (patch) | |
| tree | 4c88e002884885a75f622057ddcd7b94faae5ee8 /pkgs/os-specific/linux/powertop | |
| parent | 1a54d4bbd64921ee36e46d45552f8c3eba06c449 (diff) | |
| download | nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.tar nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.tar.gz nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.tar.bz2 nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.tar.lz nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.tar.xz nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.tar.zst nixpkgs-9d1255778313b9adc1a2f7f906aeb23a88377c82.zip | |
powertop: modprobe configs if /proc/config.gz is missing
svn path=/nixpkgs/trunk/; revision=29822
Diffstat (limited to 'pkgs/os-specific/linux/powertop')
| -rw-r--r-- | pkgs/os-specific/linux/powertop/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/powertop/modprobe_configs.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index ae23e165178..3d8ca36c3ed 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { patches = [ ./powertop-1.13.patch ./inotify_user.patch + ./modprobe_configs.patch ]; buildInputs = [ncurses gettext]; meta = { diff --git a/pkgs/os-specific/linux/powertop/modprobe_configs.patch b/pkgs/os-specific/linux/powertop/modprobe_configs.patch new file mode 100644 index 00000000000..3d6e2a28761 --- /dev/null +++ b/pkgs/os-specific/linux/powertop/modprobe_configs.patch @@ -0,0 +1,28 @@ +From 0002a70b83221a8a831d776836d13105ac886323 Mon Sep 17 00:00:00 2001 +From: Florian Friesdorf <flo@chaoflow.net> +Date: Thu, 13 Oct 2011 14:57:02 +0200 +Subject: [PATCH] powertop tries to load configs, if /proc/config.gz is + missing + +--- + config.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/config.c b/config.c +index b2567f2..62ac978 100644 +--- a/config.c ++++ b/config.c +@@ -44,6 +44,10 @@ static void read_kernel_config(void) + char filename[100]; + if (configcount) + return; ++ if (access("/proc/config.gz", R_OK) != 0) { ++ file = popen("modprobe configs >/dev/null 2>&1", "r"); ++ pclose(file); ++ } + if (access("/proc/config.gz", R_OK) == 0) { + file = popen("zcat /proc/config.gz 2> /dev/null", "r"); + while (file && !feof(file)) { +-- +1.7.6 + |