Remove remains of the "real" device type

This is not in use any more and sort of replaced by
device_is_ethernet_compatible().

diff --git a/src/hooks/zones/pppoe b/src/hooks/zones/pppoe
index a72a2a85c034b53402d31ba8bb39b5d7ea783f38..b201ebe7dd19d582044bed11f8ee79e7714a53e7 100644 (file)
--- 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 fda05a23c8525ac01b479a148882fe6b75726f1f..81bb3bb540b69354ac6d19893f084afee26e8575 100644 (file)
--- 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 785ac8988510c459f7f6d9b3ace3cd3257dd8984..a206e67d0f13563e058708d84b2012c5b184f944 100644 (file)
--- 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