diff options
| author | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-09-30 13:50:14 +0200 |
| commit | 0bef21b7d9274778958532e84565e8b76f1204ee (patch) | |
| tree | 9b6f312103439539009916cbd7352d32853cc553 /src/initrd/nm-initrd-generator.c | |
| parent | 857b32ce16c33d2fb191da77e9a3f3b542714d74 (diff) | |
| parent | d0425f68f7ee83a1dc5a6ad3688627c1b472a58b (diff) | |
Update upstream source from tag 'upstream/1.20.4'
Update to upstream version '1.20.4' with Debian dir a7248e22a7605bec597b9752dfceb6985ad68a67
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); |