From 60b84547c03ec7d82633f3c9d6939af4747a6bff Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 9 Mar 2012 11:18:10 -0500 Subject: Use NetworkManager-compatible lease file names by default. --- sysconfig/network-scripts/network-functions | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index f6d2f05b..6402a7dc 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -59,6 +59,15 @@ get_uuid_by_config () dbus-send --system --print-reply --dest=com.redhat.ifcfgrh1 /com/redhat/ifcfgrh1 com.redhat.ifcfgrh1.GetIfcfgDetails string:"/etc/sysconfig/network-scripts/$1" 2>/dev/null | awk -F '"' '/string / { print $2 }' } +generate_lease_file_name () { + local ver=$1 + LEASEFILE="/var/lib/dhclient/dhclient$ver-${DEVICE}.leases" + if [ -f $LEASEFILE ]; then + return + fi + LEASEFILE="/var/lib/dhclient/dhclient$ver-${UUID}-${DEVICE}.lease" +} + need_config () { local nconfig -- cgit v1.2.1 From 4920ccfbb5f232488f79422943dfdcac1efc5301 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 24 Apr 2012 14:37:48 -0400 Subject: Allow dhclient configuration files for DHCPv6 as well. (#815676) --- sysconfig/network-scripts/network-functions | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 6402a7dc..044f1ea1 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -68,6 +68,17 @@ generate_lease_file_name () { LEASEFILE="/var/lib/dhclient/dhclient$ver-${UUID}-${DEVICE}.lease" } +generate_config_file_name () { + local ver=$1 + if [ -s /etc/dhcp/dhclient$ver-${DEVICE}.conf ]; then + DHCLIENTCONF="-cf /etc/dhcp/dhclient$ver-${DEVICE}.conf"; + elif [ -s /etc/dhclient$ver-${DEVICE}.conf ]; then + DHCLIENTCONF="-cf /etc/dhclient$ver-${DEVICE}.conf"; + else + DHCLIENTCONF=''; + fi +} + need_config () { local nconfig -- cgit v1.2.1 From d1256a2ab6187b2c8696b25697f41a87c736de1b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 30 Apr 2012 14:03:50 -0400 Subject: Rename internal tracking variable USE_NM to _use_nm, to more clearly state it's not for configuration use. --- sysconfig/network-scripts/network-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 044f1ea1..89d5da5a 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -167,8 +167,8 @@ source_config () else ISALIAS=no fi - ! is_false $NM_CONTROLLED && is_nm_running && USE_NM=true - if [ -z "$UUID" -a "$USE_NM" = "true" ]; then + ! is_false $NM_CONTROLLED && is_nm_running && _use_nm=true + if [ -z "$UUID" -a "$_use_nm" = "true" ]; then UUID=$(get_uuid_by_config $CONFIG) fi } -- cgit v1.2.1 From 1d81c888eac95c3abe3ccd0d4bff7e73c57edcef Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 2 May 2012 13:41:01 -0400 Subject: check_device_down: Don't bother calling ip to check link state if the device doesn't exist. --- sysconfig/network-scripts/network-functions | 1 + 1 file changed, 1 insertion(+) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 89d5da5a..818a985d 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -341,6 +341,7 @@ set_hostname () check_device_down () { + [ ! -d /sys/class/net/$1 ] && return 0 if LC_ALL=C ip -o link show dev $1 2>/dev/null | grep -q ",UP" ; then return 1 else -- cgit v1.2.1 From 69ead9bb4b8ec2e45dca84b9904bc04b03666c46 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 26 Jun 2012 10:48:04 -0400 Subject: Handle (improper) quoted HWADDR (#835372) --- sysconfig/network-scripts/network-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 818a985d..81e47a20 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -29,7 +29,7 @@ get_config_by_device () get_config_by_hwaddr () { - LANG=C grep -il "^[[:space:]]*HWADDR=${1}\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-* \ + LANG=C grep -il "^[[:space:]]*HWADDR=\"\?${1}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-* \ | LC_ALL=C sed -e "$__sed_discard_ignored_files" } -- cgit v1.2.1 From 06cdd94e805e1c6d0faf3e9ece0dc71f301831ef Mon Sep 17 00:00:00 2001 From: Benjamin Coddington Date: Mon, 23 Apr 2012 11:19:43 -0400 Subject: Allow duplicate address dectection to be disabled --- sysconfig/network-scripts/network-functions | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sysconfig/network-scripts/network-functions') diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 81e47a20..5b2f30ac 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -201,6 +201,7 @@ expand_config () prefix[$i]=$(eval echo '$'PREFIX$idx) netmask[$i]=$(eval echo '$'NETMASK$idx) broadcast[$i]=$(eval echo '$'BROADCAST$idx) + arpcheck[$i]=$(eval echo '$'ARPCHECK$idx) if [ "${prefix[$i]}x" != "x" ]; then val=$(/bin/ipcalc --netmask "${ipaddr[$i]}/${prefix[$i]}") @@ -221,6 +222,12 @@ expand_config () val=$(/bin/ipcalc --broadcast ${ipaddr[$i]} ${netmask[$i]}) broadcast[$i]=${val##BROADCAST=} fi + + if [ "${arpcheck[$i]}x" != "x" ]; then + arpcheck[$i]=${arpcheck[$i]##ARPCHECK=} + arpcheck[$i]=${arpcheck[$i],,*} + fi + i=$((i+1)) done -- cgit v1.2.1