X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=sbin%2Fgrml-autoconfig;h=0abc8f89203bafe3cda465ba63090f63cb934e73;hp=57e7601d75c5bb47585895fb1def472a4b21d01e;hb=724713da63a47e2dd8aa7e7a180ae9d2d891b672;hpb=1c1a58499d78615efd64540abe41d0dc31bdb6d0

diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig
index 57e7601..0abc8f8 100755
--- a/sbin/grml-autoconfig
+++ b/sbin/grml-autoconfig
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika(at)grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Nov 16 20:24:16 CET 2006 [mika]
 ################################################################################
 
 if [ "$UID" != 0 ];  then
@@ -13,22 +12,21 @@ fi
 
 LANG=C
 LC_ALL=C
-PN=`basename "$0"`
-TMPFILE=`mktemp`
-
-grep -q small /etc/grml_version 2>/dev/null && AUTOCONFIG=/etc/grml/autoconfig.small || AUTOCONFIG=/etc/grml/autoconfig
+PN="$(basename $0)"
+TMPFILE="$(mktemp)"
 
+AUTOCONFIG=/etc/grml/autoconfig
 [ -r $AUTOCONFIG ] || exit 1
 
 # helper functions
 activate_value()
 {
-  sed -i "s/$1.*/$1='yes'/" $AUTOCONFIG
+  sed -i "s/$1.*/$1'yes'/" $AUTOCONFIG
 }
 
 deactivate_value()
 {
-  sed -i "s/$1.*/$1='no'/" $AUTOCONFIG
+  sed -i "s/$1.*/$1'no'/" $AUTOCONFIG
 }
 
 check_setting()
@@ -39,6 +37,9 @@ check_setting()
 check_current_state()
 {
   grep -q '^CONFIG_DHCP=.*yes'     $AUTOCONFIG && DHCPSTATUS=ON     || DHCPSTATUS=OFF
+  if [ "$(grep '^auto' /etc/network/interfaces | sed 's/ lo// ; s/auto// ; s/ //g')" != "" ] ; then
+     DHCPSTATUS=OFF
+  fi
   grep -q '^CONFIG_FSTAB=.*yes'    $AUTOCONFIG && FSTABSTATUS=ON    || FSTABSTATUS=OFF
   grep -q '^CONFIG_CPU=.*yes'      $AUTOCONFIG && CPUSTATUS=ON      || CPUSTATUS=OFF
   grep -q '^CONFIG_ACPI_APM=.*yes' $AUTOCONFIG && ACPI_APMSTATUS=ON || ACPI_APMSTATUS=OFF
@@ -70,12 +71,12 @@ 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
-  check_setting syslog      && activate_value CONFIG_SYSLOG       || deactivate_value CONFIG_SYSLOG
-  check_setting gpm         && activate_value CONFIG_GPM          || deactivate_value CONFIG_GPM
+  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=
+  check_setting syslog    && activate_value CONFIG_SYSLOG=   || deactivate_value CONFIG_SYSLOG=
+  check_setting gpm       && activate_value CONFIG_GPM=      || deactivate_value CONFIG_GPM=
 }
 
 # and now run it: