mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-25 09:30:36 +01:00
core: device: allow to change the admin state of the device in SetManaged()
Control it with a new NM_DEVICE_MANAGED_SET_ADMIN_STATE flag. This flag will make that, at the same time that the device is moved to managed/unmanaged, it's admin state is set to up/down. Many users want to have a way to have their devices in a DOWN admin state when they are not using them. Because of the complex activation process, NM wants to have its devices in UP state all the time. However, it is not a problem to have it DOWN if we are not managing it.
This commit is contained in:
parent
b5bb4e578f
commit
65660ad1c4
2 changed files with 18 additions and 4 deletions
|
|
@ -15010,6 +15010,15 @@ set_managed(NMDevice *self, NMDeviceManaged managed, NMDeviceManagedFlags flags,
|
|||
g_object_get(self, NM_DEVICE_MANAGED, &managed_new, NULL);
|
||||
if (managed_old != managed_new)
|
||||
_notify(self, PROP_MANAGED);
|
||||
|
||||
/* If requested, set the administrative state of the device to UP if the
|
||||
* new managed state is YES, and to DOWN if it's NO. */
|
||||
if (flags & NM_DEVICE_MANAGED_FLAGS_SET_ADMIN_STATE) {
|
||||
nm_platform_link_change_flags(nm_device_get_platform(self),
|
||||
nm_device_get_ifindex(self),
|
||||
IFF_UP,
|
||||
!!managed);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1268,16 +1268,21 @@ typedef enum {
|
|||
* @NM_DEVICE_MANAGED_FLAGS_PERMANENT: to set the device managed state to the permanent (on disk) value.
|
||||
* @NM_DEVICE_MANAGED_FLAGS_BY_MAC: to match the device by MAC address, not by name.
|
||||
* This option only makes sense together with %NM_DEVICE_MANAGED_FLAGS_PERMANENT.
|
||||
* @NM_DEVICE_MANAGED_FLAGS_SET_ADMIN_STATE: to set the administrative state of the
|
||||
* device to up if the managed state is %NM_DEVICE_MANAGED_YES, and down if the managed state
|
||||
* is %NM_DEVICE_MANAGED_NO. If the flag is not set, the administrative state is not changed.
|
||||
* The flag is ignored for %NM_DEVICE_MANAGED_RESET.
|
||||
*
|
||||
* Flags for the SetManaged() D-Bus call of a device and nm_device_set_managed_async().
|
||||
*
|
||||
* Since: 1.58
|
||||
*/
|
||||
typedef enum /*< flags >*/ {
|
||||
NM_DEVICE_MANAGED_FLAGS_NONE = 0,
|
||||
NM_DEVICE_MANAGED_FLAGS_RUNTIME = 0x1,
|
||||
NM_DEVICE_MANAGED_FLAGS_PERMANENT = 0x2,
|
||||
NM_DEVICE_MANAGED_FLAGS_BY_MAC = 0x4,
|
||||
NM_DEVICE_MANAGED_FLAGS_NONE = 0,
|
||||
NM_DEVICE_MANAGED_FLAGS_RUNTIME = 0x1,
|
||||
NM_DEVICE_MANAGED_FLAGS_PERMANENT = 0x2,
|
||||
NM_DEVICE_MANAGED_FLAGS_BY_MAC = 0x4,
|
||||
NM_DEVICE_MANAGED_FLAGS_SET_ADMIN_STATE = 0x8,
|
||||
} NMDeviceManagedFlags;
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue