From: Michael Prokop <mika@grml.org>
Date: Wed, 30 May 2007 08:34:23 +0000 (+0200)
Subject: Deactivate CONFIG_DHCP in /etc/grml/autconfig; redirector errors to /dev/null in... 
X-Git-Tag: 0.1.12
X-Git-Url: http://git.grml.org/?p=grml-network.git;a=commitdiff_plain;h=8ca1b7528f447a55a82d666e2aeec39eb1fb07ca

Deactivate CONFIG_DHCP in /etc/grml/autconfig; redirector errors to /dev/null in generate_udev_entry
---

diff --git a/debian/changelog b/debian/changelog
index 05bb271..13f9760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grml-network (0.1.12) unstable; urgency=low
+
+  * Deactivate CONFIG_DHCP in /etc/grml/autconfig if user
+    wants to use configuration via /etc/network/interfaces.
+    [Closes: issue225]
+  * generate_udev_entry: send errors to /dev/null as well because
+    the the /lib/udev/write_net_rules script script outputs a sed
+    warning which might unsettle users
+
+ -- Michael Prokop <mika@grml.org>  Wed, 30 May 2007 10:26:42 +0200
+
 grml-network (0.1.11) unstable; urgency=low
 
   * Remove german umlauts from scripts to avoid problems with
diff --git a/sbin/netcardconfig b/sbin/netcardconfig
index 75225f0..e0b23d3 100755
--- a/sbin/netcardconfig
+++ b/sbin/netcardconfig
@@ -4,7 +4,7 @@
 # Authors:       Michael Prokop <mika@grml.org>, Marcel Wichern 2006, Klaus Knopper 2002, Niall Walsh + Stefan Lippers-Hollmann 2004-2007
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Mär 15 20:36:48 CET 2007 [mika]
+# Latest change: Mit Mai 30 10:26:39 CEST 2007 [mika]
 ################################################################################
 # Changes have been merged from Kanotix's and Sidux's netcardconfig:
 # http://kanotix.com/files/debian/pool/main/n/netcardconfig-kanotix/
@@ -92,7 +92,15 @@ generate_udev_entry() {
       echo -n "INTERFACE=$interface /lib/udev/write_net_rules " >> /etc/udev/scripts/netcardconfig && \
       udevinfo -a -p /sys/class/net/$interface | awk -F'==' '/address/ {print $2}' >> /etc/udev/scripts/netcardconfig
   done
-  chmod +x /etc/udev/scripts/netcardconfig && /etc/udev/scripts/netcardconfig 1>/dev/null
+  # send errors to /dev/null as well because the sed line inside the /lib/udev/write_net_rules
+  # script outputs a sed warning which might unsettle users
+  chmod +x /etc/udev/scripts/netcardconfig && /etc/udev/scripts/netcardconfig 1>/dev/null 2>&1
+}
+
+disable_config_dhcp() {
+  if grep -q CONFIG_DHCP /etc/grml/autoconfig ; then
+     sed -i "s|^CONFIG_DHCP.*|CONFIG_DHCP='no'|" /etc/grml/autoconfig
+  fi
 }
 
 device2props() {
@@ -557,6 +565,8 @@ while (true); do
          addauto
          # get persistent interface names across reboots
          generate_udev_entry
+	 # make sure we don't run the dhcp stuff when using /etc/network/interfaces
+	 disable_config_dhcp
       else
          remauto
       fi