|
 |
a56a5e |
From b4b60da8dcdd6bc6f1e66ece90e1070b07db0cf4 Mon Sep 17 00:00:00 2001
|
|
|
966cef |
From: Harald Hoyer <harald@redhat.com>
|
|
|
966cef |
Date: Thu, 30 Jan 2014 13:50:02 +0100
|
|
|
966cef |
Subject: [PATCH] network: understand ip=.....:<dns1>:<dns2>
|
|
|
966cef |
|
|
|
966cef |
---
|
|
|
966cef |
modules.d/40network/net-lib.sh | 23 +++++++++++++++++------
|
|
|
966cef |
1 file changed, 17 insertions(+), 6 deletions(-)
|
|
|
966cef |
|
|
|
966cef |
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
|
|
|
1755ca |
index 7544401f..36fad122 100755
|
|
|
966cef |
--- a/modules.d/40network/net-lib.sh
|
|
|
966cef |
+++ b/modules.d/40network/net-lib.sh
|
|
|
966cef |
@@ -339,7 +339,7 @@ ip_to_var() {
|
|
|
966cef |
fi
|
|
|
966cef |
done
|
|
|
966cef |
|
|
|
966cef |
- unset ip srv gw mask hostname dev autoconf macaddr mtu
|
|
|
966cef |
+ unset ip srv gw mask hostname dev autoconf macaddr mtu dns1 dns2
|
|
|
966cef |
case $# in
|
|
|
966cef |
0) autoconf="error" ;;
|
|
|
966cef |
1) autoconf=$1 ;;
|
|
|
966cef |
@@ -347,11 +347,22 @@ ip_to_var() {
|
|
|
966cef |
3) [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3 ;;
|
|
|
966cef |
4) [ -n "$1" ] && dev=$1; [ -n "$2" ] && autoconf=$2; [ -n "$3" ] && mtu=$3; [ -n "$4" ] && macaddr=$4 ;;
|
|
|
966cef |
*) [ -n "$1" ] && ip=$1; [ -n "$2" ] && srv=$2; [ -n "$3" ] && gw=$3; [ -n "$4" ] && mask=$4;
|
|
|
966cef |
- [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7; [ -n "$8" ] && mtu=$8;
|
|
|
966cef |
- if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then
|
|
|
966cef |
- macaddr="${9}:${10}:${11}:${12}:${13}:${14}"
|
|
|
966cef |
- fi
|
|
|
966cef |
- ;;
|
|
|
966cef |
+ [ -n "$5" ] && hostname=$5; [ -n "$6" ] && dev=$6; [ -n "$7" ] && autoconf=$7;
|
|
|
966cef |
+ case "$8" in
|
|
|
966cef |
+ [0-9]*:*|[0-9]*.[0-9]*.[0-9]*.[0-9]*)
|
|
|
966cef |
+ dns1="$mtu"; unset $mtu
|
|
|
966cef |
+ [ -n "$9" ] && dns2="$9"
|
|
|
966cef |
+ ;;
|
|
|
966cef |
+ [0-9]*)
|
|
|
966cef |
+ mtu="$8"
|
|
|
966cef |
+ ;;
|
|
|
966cef |
+ *)
|
|
|
966cef |
+ if [ -n "${9}" -a -n "${10}" -a -n "${11}" -a -n "${12}" -a -n "${13}" -a -n "${14}" ]; then
|
|
|
966cef |
+ macaddr="${9}:${10}:${11}:${12}:${13}:${14}"
|
|
|
966cef |
+ fi
|
|
|
966cef |
+ ;;
|
|
|
966cef |
+ esac
|
|
|
966cef |
+ ;;
|
|
|
966cef |
esac
|
|
|
966cef |
|
|
|
966cef |
# ip=<ipv4-address> means anaconda-style static config argument cluster:
|