SW: drop deprecated cpufrequtils (+ drop scripts/GRMLBASE/36-cpufrequtils)

The cpufreq drivers are autoloaded and the powersave/ondemand driver
is mature enough. The linux-cpupower tools provide the binaries
as replacement for what cpufrequtils provided so far and we ship
them (with GRML_FULL) already.

Also see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=877016

Thanks: Michael Biebl for the pointer
Closes: https://github.com/grml/grml/issues/51

diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript
index 168dd5d..1338414 100644 (file)
--- a/debian/grml-live.maintscript
+++ b/debian/grml-live.maintscript
@@ -1 +1,2 @@
-rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE
+rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE 0.32.3~
+rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 5c96bec..068ab1d 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -324,7 +324,6 @@ xterm
 acpi
 acpi-support
 cmospwd
 acpi
 acpi-support
 cmospwd

-cpufrequtils

 cpuid
 irqbalance
 lm-sensors
 cpuid
 irqbalance
 lm-sensors

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index ec96c57..1b90f7e 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -12,7 +12,6 @@ buffer
 chntpw
 coreutils
 cpio
 chntpw
 coreutils
 cpio

-cpufrequtils

 cryptsetup
 cu
 dctrl-tools
 cryptsetup
 cu
 dctrl-tools

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils b/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
deleted file mode 100755 (executable)
index d496684..0000000
--- a/etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/36-cpufrequtils
-# Purpose:       configure cpufrequtils of live-system
-# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2 or any later version.
-################################################################################
-
-set -u
-set -e
-
-if [ -r $target/usr/share/doc/cpufrequtils/examples/cpufrequtils.sample ] ; then
-   if ! [ -r $target/etc/default/loadcpufreq ] ; then
-      cat $target/usr/share/doc/cpufrequtils/examples/cpufrequtils.sample > $target/etc/default/loadcpufreq
-      sed -i 's/^ENABLE=.*/ENABLE="true"/' $target/etc/default/loadcpufreq
-   fi
-fi
-
-## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2