Check for auto device in /etc/network/interfaces

diff --git a/debian/changelog b/debian/changelog
index 2108cc0..55e5947 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-autoconfig (0.8.2) unstable; urgency=low
+
+  * grml-autoconfig scripts: if an "auto" configured device can be found in
+    /etc/network/interfaces (except for the loopback device) then suggest
+    setting CONFIG_DHCP=no by default. Thanks for feedback, Bernd Haug!
+    [Closes: issue324]
+
+ -- Michael Prokop <mika@grml.org>  Sat, 19 Jan 2008 23:03:18 +0100
+
 grml-autoconfig (0.8.1) unstable; urgency=low
 
   * Support multiple modules in bootoption blacklist.

diff --git a/sbin/grml-autoconfig b/sbin/grml-autoconfig
index 1bf1dae..26f8cd7 100755 (executable)
--- a/sbin/grml-autoconfig
+++ b/sbin/grml-autoconfig
@@ -4,7 +4,7 @@
 # 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 Mär 29 11:30:33 CEST 2007 [mika]
+# Latest change: Sam Jän 19 23:02:56 CET 2008 [mika]
 ################################################################################
 
 if [ "$UID" != 0 ];  then
@@ -13,10 +13,14 @@ fi
 
 LANG=C
 LC_ALL=C
-PN=`basename "$0"`
-TMPFILE=`mktemp`
+PN="$(basename $0)"
+TMPFILE="$(mktemp)"
 
-grep -q small /etc/grml_version 2>/dev/null && AUTOCONFIG=/etc/grml/autoconfig.small || AUTOCONFIG=/etc/grml/autoconfig
+if grep -q small /etc/grml_version 2>/dev/null ; then
+   AUTOCONFIG=/etc/grml/autoconfig.small
+else
+   AUTOCONFIG=/etc/grml/autoconfig
+fi
 
 [ -r $AUTOCONFIG ] || exit 1
 
@@ -39,6 +43,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