New upstream version 1.34.0 upstream/1.34.0

1 files changed, 13 insertions, 7 deletions

diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index 0cb347f5..d2e472a0 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -9,7 +9,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#if HAVE_EDITLINE_READLINE
+#include <editline/readline.h>
+#else
 #include <readline/readline.h>
+#endif
 #include <linux/if_ether.h>
 
 #include "libnm-glib-aux/nm-secret-utils.h"
@@ -2539,7 +2543,7 @@ do_device_modify(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
     *info = (ModifyInfo){
         .nmc  = nmc,
         .argc = argc,
-        .argv = nm_utils_strv_dup(argv, argc, TRUE),
+        .argv = nm_strv_dup(argv, argc, TRUE),
     };
 
     nm_device_get_applied_connection_async(device, 0, NULL, modify_get_applied_cb, info);
@@ -5020,17 +5024,19 @@ void
 nmc_command_func_device(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const *argv)
 {
     static const NMCCommand cmds[] = {
-        {"status", do_devices_status, usage_device_status, TRUE, TRUE},
-        {"show", do_device_show, usage_device_show, TRUE, TRUE},
         {"connect", do_device_connect, usage_device_connect, TRUE, TRUE},
-        {"reapply", do_device_reapply, usage_device_reapply, TRUE, TRUE},
         {"disconnect", do_devices_disconnect, usage_device_disconnect, TRUE, TRUE},
         {"delete", do_devices_delete, usage_device_delete, TRUE, TRUE},
-        {"set", do_device_set, usage_device_set, TRUE, TRUE},
-        {"monitor", do_devices_monitor, usage_device_monitor, TRUE, TRUE},
-        {"wifi", do_device_wifi, usage_device_wifi, FALSE, FALSE},
+        {"down", do_devices_disconnect, usage_device_disconnect, TRUE, TRUE},
         {"lldp", do_device_lldp, usage_device_lldp, FALSE, FALSE},
+        {"monitor", do_devices_monitor, usage_device_monitor, TRUE, TRUE},
         {"modify", do_device_modify, usage_device_modify, TRUE, TRUE},
+        {"reapply", do_device_reapply, usage_device_reapply, TRUE, TRUE},
+        {"status", do_devices_status, usage_device_status, TRUE, TRUE},
+        {"set", do_device_set, usage_device_set, TRUE, TRUE},
+        {"show", do_device_show, usage_device_show, TRUE, TRUE},
+        {"up", do_device_connect, usage_device_connect, TRUE, TRUE},
+        {"wifi", do_device_wifi, usage_device_wifi, FALSE, FALSE},
         {NULL, do_devices_status, usage, TRUE, TRUE},
     };