Adjust 15_networking_grml.patch + 27_support_static_ip.patch for klibc's ipconfig...

Quoting Debian changelog of klibc-utils:

| klibc (2.0-2) unstable; urgency=low
|
|   * debian/control: Add breaks to initramfs-tools for ipconfig /run switch.

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index fd257e1..ca1f9c4 100644 (file)
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -9,10 +9,8 @@
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
-Index: b/scripts/live-bottom/23networking_grml
-===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ b/scripts/live-bottom/23networking_grml    2011-07-24 22:08:07.000000000 +0200
+--- /dev/null
++++ b/scripts/live-bottom/23networking_grml
 @@ -0,0 +1,107 @@
 +#!/bin/sh
 +
@@ -81,7 +79,7 @@ Index: b/scripts/live-bottom/23networking_grml
 +
 +    # NODHCP or a previously run ipconfig mean that ifupdown should never
 +    # touch this interface (IP-stack wise).
-+    netconfig=/tmp/net-${interface}.conf
++    netconfig=/run/net-${interface}.conf
 +    if [ -n "$NODHCP" ] || [ -e "${netconfig}" ]; then
 +        method="manual"
 +    fi

diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch
index 0bef1cb..a3fbdb5 100644 (file)
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -79,7 +79,7 @@
        fi
  
        # split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -374,38 +397,29 @@
+@@ -374,43 +397,34 @@
                devlist="$devlist $device"
        done
  
@@ -110,8 +110,8 @@
 -                      export DEVICE="$dev"
 -                      break
 +              IPV4ADDR="0.0.0.0"
-+              if [ -e "/tmp/net-${device}.conf" ]; then
-+                      . /tmp/net-${device}.conf
++              if [ -e "/run/net-${device}.conf" ]; then
++                      . /run/net-${device}.conf
 +              fi
 +              if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
 +                      export DEVICE="$dev $DEVICE"
@@ -134,6 +134,12 @@
  
        for interface in ${DEVICE}; do
                # source relevant ipconfig output
+               OLDHOSTNAME=${HOSTNAME}
+-              [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
++              [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
+               [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
+               export HOSTNAME
+ 
 --- a/scripts/live-helpers
 +++ b/scripts/live-helpers
 @@ -93,9 +93,8 @@