diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-10-07 11:18:33 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-10-07 11:18:33 +0200 |
| commit | 2db79403563179c1a29e6292172f5563acf13c70 (patch) | |
| tree | 7ffefc53c347326e24f28785241f1409a1ecbbf6 /src/initrd/nm-initrd-generator.c | |
| parent | 5b9d4e305df987ddad7f3d05afd709a70cddf7fd (diff) | |
| parent | 790e3946f0274a272fdda4d8697ce31a757a48d2 (diff) | |
Merge remote-tracking branch 'salsa/master'
Diffstat (limited to 'src/initrd/nm-initrd-generator.c')
| -rw-r--r-- | src/initrd/nm-initrd-generator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/initrd/nm-initrd-generator.c b/src/initrd/nm-initrd-generator.c index c916459d..0ff3428e 100644 --- a/src/initrd/nm-initrd-generator.c +++ b/src/initrd/nm-initrd-generator.c @@ -95,7 +95,7 @@ main (int argc, char *argv[]) int errsv; option_context = g_option_context_new ("-- [ip=...] [rd.route=...] [bridge=...] [bond=...] [team=...] [vlan=...] " - "[bootdev=...] [nameserver=...] [rd.peerdns=...] [rd.bootif=...] [BOOTIF=...] ... "); + "[bootdev=...] [nameserver=...] [rd.peerdns=...] [rd.bootif=...] [BOOTIF=...] [rd.znet=...] ... "); g_option_context_set_summary (option_context, "Generate early NetworkManager configuration."); g_option_context_set_description (option_context, @@ -127,7 +127,7 @@ main (int argc, char *argv[]) return 1; } - connections = nmi_cmdline_reader_parse (sysfs_dir, remaining); + connections = nmi_cmdline_reader_parse (sysfs_dir, (const char *const*) remaining); g_hash_table_foreach (connections, output_conn, connections_dir); g_hash_table_destroy (connections); |