X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=sbin%2Fgrml-autoconfig;h=692595d3ab83ee5c9ddbf0d0ca05c766ec70f91e;hp=dcb679aeff1ba2a8428fa35ebe07e84cdb39ef7a;hb=726de5e0a58b2b4b5ff10e62339bff5eb565f62a;hpb=7cb161660378ad231beca0f24a32a2bbcfec4518

diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig
index dcb679a..692595d 100755
--- a/sbin/grml-autoconfig
+++ b/sbin/grml-autoconfig
@@ -51,10 +51,6 @@ is_set()
 }
 check_current_state()
 {
-  is_set $CONFIG_DHCP       && DHCPSTATUS=ON     || DHCPSTATUS=OFF
-  if [ "$(grep '^auto' /etc/network/interfaces | sed 's/ lo// ; s/auto// ; s/ //g')" != "" ] ; then
-     DHCPSTATUS=OFF
-  fi
   is_set $CONFIG_FSTAB      && FSTABSTATUS=ON    || FSTABSTATUS=OFF
   is_set $CONFIG_CPU        && CPUSTATUS=ON      || CPUSTATUS=OFF
   is_set $CONFIG_ACPI_APM   && ACPI_APMSTATUS=ON || ACPI_APMSTATUS=OFF
@@ -65,12 +61,12 @@ check_current_state()
 # main program
 interface()
 {
-  dialog --cr-wrap --clear --cancel-label "Exit" --title "$PN" --checklist "grml-autoconfig is the framework which includes hardware
-detection, activation of system services and this is the
+  dialog --cr-wrap --clear --cancel-label "Exit" --title "$PN" --checklist \
+"grml-autoconfig is the framework which includes hardware
+detection, activation of system services. This is the
 interface to activate or deactivate some features.
 
-If you do not know what to do at this stage just leave it untouched,
-the defaults represent the recommended values.
+If you do not know what to do at this stage just leave it untouched.
 
 All the configuration happens in the file /etc/grml/autoconfig.local -
 you can edit the file manually as well.
@@ -78,11 +74,9 @@ you can edit the file manually as well.
 Please do not confuse these settings with plain Debian configuration.
 For example disabling dhcp here will NOT deactivate any configured network
 settings in /etc/network/interfaces, it just configures grml-autoconfig
-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 \
-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 \
@@ -91,7 +85,6 @@ gpm "start GPM (mouse on console)" $GPMSTATUS \
 
 set_values()
 {
-  check_setting dhcp      && activate_value CONFIG_DHCP=     || deactivate_value CONFIG_DHCP=
   check_setting fstab     && activate_value CONFIG_FSTAB=    || deactivate_value CONFIG_FSTAB=
   check_setting cpufreq   && activate_value CONFIG_CPU=      || deactivate_value CONFIG_CPU=
   check_setting acpi_apm  && activate_value CONFIG_ACPI_APM= || deactivate_value CONFIG_ACPI_APM=