X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=sbin%2Fgrml-autoconfig;h=0e318072894a4fa7287ed8e754363b4dc415992a;hp=0ae3c016992ba5e84ddf0faf58fc0b9c1e12d5f9;hb=efc764b66b6954e7cb138414f4cc12bd9c7201f2;hpb=5477800ccfa893b4ed316b68fb5de73735c886fc;ds=inline

diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig
index 0ae3c01..0e31807 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
@@ -80,7 +76,6 @@ 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 cpu frequency scaling" $CPUSTATUS \
 acpi_apm "load ACPI/APM modules" $ACPI_APMSTATUS \
@@ -91,7 +86,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=