diff options
| author | Olav Vitters <olav@vitters.nl> | 2020-07-25 23:35:39 +0200 |
|---|---|---|
| committer | Olav Vitters <olav@vitters.nl> | 2020-07-25 23:35:39 +0200 |
| commit | 42dca037ab23d6f576e2d46b50adf76db72694ea (patch) | |
| tree | 826f79d142ebe7975892e5aaddf261d1fb420e2f | |
| parent | c815eaa7e1ef056d00c788bdfdc2051dfc0d0cb6 (diff) | |
| download | initscripts-42dca037ab23d6f576e2d46b50adf76db72694ea.tar initscripts-42dca037ab23d6f576e2d46b50adf76db72694ea.tar.gz initscripts-42dca037ab23d6f576e2d46b50adf76db72694ea.tar.bz2 initscripts-42dca037ab23d6f576e2d46b50adf76db72694ea.tar.xz initscripts-42dca037ab23d6f576e2d46b50adf76db72694ea.zip | |
ifdown-eth: minimize changes with upstream
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-eth | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 36e796f4..da6b77ee 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -112,7 +112,7 @@ for VER in "" 6 ; do fi fi done -} +} # Kill running dhcp client if present (supports more clients than the above) dhcp_client_pids() { @@ -200,7 +200,7 @@ while ! check_device_down ${DEVICE} && [ "$waited" -lt 50 ] ; do done # don't leave an outdated key sitting around -if [ -z "$IN_HOTPLUG" -a -n "${WIRELESS_ENC_KEY}" -a -x /sbin/iwconfig ]; then +if [ -z "$IN_HOTPLUG" ] && [ -n "${WIRELESS_ENC_KEY}" ] && [ -x /sbin/iwconfig ]; then /sbin/iwconfig ${DEVICE} enc 0 >/dev/null 2>&1 fi |