From 5477800ccfa893b4ed316b68fb5de73735c886fc Mon Sep 17 00:00:00 2001
From: Christian Hofstaedtler <ch@grml.org>
Date: Mon, 6 Dec 2010 23:15:42 +0100
Subject: [PATCH] Use (moved) debnet from grml-network

---
 autoconfig.functions | 39 +--------------------------------------
 debian/control       |  2 +-
 2 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index fdbe87c..33f7cb8 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -2340,45 +2340,8 @@ config_lvm(){
 # {{{ debnet: setup network based on an existing one found on a partition
 config_debnet(){
 if checkbootparam 'debnet' ; then
- iszsh && setopt localoptions shwordsplit
- DEVICES="$(< /proc/partitions tail -n +3 | awk '{print "/dev/"$4}' | tr "\n" " ")"
- DEVICES="$DEVICES $(ls /dev/mapper/*)"
- FOUND_DEBNET=""
-
  einfo "Bootoption 'debnet' found. Searching for Debian network configuration: "
- eindent
- if ! mount | grep '/mnt ' >/dev/null 2>&1 ; then
-    for i in $DEVICES; do
-     if mount -o ro -t auto "$i" /mnt >/dev/null 2>&1; then
-         einfo "Scanning on $i"
-       if [ -f /mnt/etc/network/interfaces ]; then
-         einfo "/etc/network/interfaces found on ${i}" ; eend 0
-         FOUND_DEBNET="$i"
-         break
-       fi
-       umount /mnt
-     fi
-    done
-
-   if [ -n "$FOUND_DEBNET" ]; then
-     einfo "Stopping network."
-       pump -k >/dev/null 2>&1
-       /etc/init.d/networking stop >/dev/null 2>&1 ; eend $?
-     einfo "Copying Debian network configuration from $FOUND_DEBNET to running system."
-       rm -rf /etc/network/run
-       cp -a /mnt/etc/network /etc
-       rm -rf /etc/network/run
-       mkdir /etc/network/run
-       umount /mnt ; eend $?
-     einfo "Starting network."
-       invoke-rc.d networking start ; eend $?
-   else
-     eerror "/etc/network/interfaces not found." ; eend 1
-   fi
-   eoutdent
- else
-  eerror "Error: /mnt already mounted." ; eend 1
- fi
+ /usr/sbin/debnet
 fi
 }
 # }}}
diff --git a/debian/control b/debian/control
index a1da751..0ee5a36 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: grml-autoconfig
 Architecture: all
 Conflicts: grml-etc (<= 0.4-7), grml-saveconfig
 Replaces: grml-saveconfig
-Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng | system-log-daemon, kbd | console-utilities, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync
+Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, hotplug | hotplug-light | udev (>= 0.080-1), zsh, gpm, syslog-ng | system-log-daemon, kbd | console-utilities, console-terminus, pump, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync, grml-network (>= 0.3.7)
 Recommends: acpi-support, hwinfo, alsa-utils, mdadm, aumix, locales, grml2hd, grml-debootstrap (>= 0.7)
 Description: main bootup process of a Grml (based) system
  grml-autoconfig is the main part of the bootup process of the
-- 
2.1.4