Drop powernowd from Recommends and adjust naming of cpu frequency.

diff --git a/autoconfig.functions b/autoconfig.functions
index 07e0980..23b39ac 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -1547,7 +1547,7 @@ if checkbootparam 'vnc' ; then
       #store the options in a file
       VNCDIR="/home/${USER}/.vnc"
       [ -d "$VNCDIR" ] || mkdir "$VNCDIR"
       #store the options in a file
       VNCDIR="/home/${USER}/.vnc"
       [ -d "$VNCDIR" ] || mkdir "$VNCDIR"

-      echo " --connect $VNC_CONNECT " >> $VNCDIR/options 
+      echo " --connect $VNC_CONNECT " >> $VNCDIR/options

    fi
 fi
 }
    fi
 fi
 }

diff --git a/debian/control b/debian/control
index a8cd0bc..a1da751 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Package: grml-autoconfig
 Architecture: all
 Conflicts: grml-etc (<= 0.4-7), grml-saveconfig
 Replaces: grml-saveconfig
 Architecture: all
 Conflicts: grml-etc (<= 0.4-7), grml-saveconfig
 Replaces: grml-saveconfig

-Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1),zsh, gpm, syslog-ng | system-log-daemon, kbd | console-utilities, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
-Recommends: acpi-support, hwinfo, alsa-utils, mdadm, powernowd, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)
+Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng | system-log-daemon, kbd | console-utilities, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
+Recommends: acpi-support, hwinfo, alsa-utils, mdadm, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)

 Description: main bootup process of a Grml (based) system
  grml-autoconfig is the main part of the bootup process of the
  grml system. This includes the hardware recognition system and
 Description: main bootup process of a Grml (based) system
  grml-autoconfig is the main part of the bootup process of the
  grml system. This includes the hardware recognition system and

diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig
index dcb679a..0ae3c01 100755 (executable)
--- a/sbin/grml-autoconfig
+++ b/sbin/grml-autoconfig
@@ -82,7 +82,7 @@ related settings instead.
 " 0 0 0 \
 dhcp "check for network devices and run pump (get ip-address via DHCP)" $DHCPSTATUS \
 fstab "update /etc/fstab entries (check for devices)" $FSTABSTATUS \
 " 0 0 0 \
 dhcp "check for network devices and run pump (get ip-address via DHCP)" $DHCPSTATUS \
 fstab "update /etc/fstab entries (check for devices)" $FSTABSTATUS \

-cpufreq "activate cpydyn/powernowd for frequency-scalable CPUs" $CPUSTATUS \
+cpufreq "activate cpu frequency scaling" $CPUSTATUS \

 acpi_apm "load ACPI/APM modules" $ACPI_APMSTATUS \
 syslog "start syslog-ng" $SYSLOGSTATUS \
 gpm "start GPM (mouse on console)" $GPMSTATUS \
 acpi_apm "load ACPI/APM modules" $ACPI_APMSTATUS \
 syslog "start syslog-ng" $SYSLOGSTATUS \
 gpm "start GPM (mouse on console)" $GPMSTATUS \