From 5dfc94a8b6045b1120789696b19658fb7f734f3d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 23 Dec 2014 01:20:14 +0000 Subject: [PATCH] Remove remains of the "real" device type This is not in use any more and sort of replaced by device_is_ethernet_compatible(). --- src/hooks/zones/pppoe | 3 ++- src/network | 4 ++-- src/udev/network-hotplug-rename | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/hooks/zones/pppoe b/src/hooks/zones/pppoe index a72a2a85..b201ebe7 100644 --- a/src/hooks/zones/pppoe +++ b/src/hooks/zones/pppoe @@ -136,7 +136,8 @@ function hook_down() { function hook_discover() { local device=${1} - if [ "$(device_get_type ${device})" != "real" ]; then + # This obviously only works on ethernet (or compatible) devices + if ! device_is_ethernet_compatible "${device}"; then exit ${EXIT_ERROR} fi diff --git a/src/network b/src/network index fda05a23..81bb3bb5 100644 --- a/src/network +++ b/src/network @@ -239,8 +239,8 @@ function cli_device_discover() { local device=${1} shift - local device_type=$(device_get_type ${device}) - if [ "${device_type}" != "real" ]; then + # This can only be executed for ethernet (or compatible) devices + if ! device_is_ethernet_compatible "${device}"; then return ${EXIT_OK} fi diff --git a/src/udev/network-hotplug-rename b/src/udev/network-hotplug-rename index 785ac898..a206e67d 100644 --- a/src/udev/network-hotplug-rename +++ b/src/udev/network-hotplug-rename @@ -60,7 +60,7 @@ type=$(device_get_type ${INTERFACE}) log DEBUG "Interface '${INTERFACE}' is of type '${type}'." case "${type}" in - ethernet|real) + ethernet) # Search within all the port configurations # if this port has already been configured. for port in $(ports_get_all); do -- 2.39.2