summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/.gitignore1
-rw-r--r--src/network/networkd-wait-online-gperf.gperf17
-rw-r--r--src/network/networkd-wait-online.c116
-rw-r--r--src/network/networkd-wait-online.conf11
-rw-r--r--src/network/networkd-wait-online.h4
5 files changed, 80 insertions, 69 deletions
diff --git a/src/network/.gitignore b/src/network/.gitignore
index e3b86e2d4a..8858596489 100644
--- a/src/network/.gitignore
+++ b/src/network/.gitignore
@@ -1,3 +1,2 @@
/networkd-network-gperf.c
/networkd-netdev-gperf.c
-/networkd-wait-online-gperf.c
diff --git a/src/network/networkd-wait-online-gperf.gperf b/src/network/networkd-wait-online-gperf.gperf
deleted file mode 100644
index 0a5e5eee55..0000000000
--- a/src/network/networkd-wait-online-gperf.gperf
+++ /dev/null
@@ -1,17 +0,0 @@
-%{
-#include <stddef.h>
-#include "conf-parser.h"
-#include "networkd-wait-online.h"
-%}
-struct ConfigPerfItem;
-%null_strings
-%language=ANSI-C
-%define slot-name section_and_lvalue
-%define hash-function-name wait_online_gperf_hash
-%define lookup-function-name wait_online_gperf_lookup
-%readonly-tables
-%omit-struct-type
-%struct-type
-%includes
-%%
-WaitOnline.ExpectedLinks, config_parse_strv, 0, offsetof(Manager, expected_links)
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index 6a7c62feae..6530659c10 100644
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -21,6 +21,7 @@
#include <netinet/ether.h>
#include <linux/if.h>
+#include <getopt.h>
#include "sd-event.h"
#include "event-util.h"
@@ -35,6 +36,75 @@
#include "conf-parser.h"
#include "strv.h"
#include "util.h"
+#include "build.h"
+
+static bool arg_quiet = false;
+static char **arg_interfaces = NULL;
+
+static int help(void) {
+
+ printf("%s [OPTIONS...]\n\n"
+ "Block until network is configured.\n\n"
+ " -h --help Show this help\n"
+ " --version Print version string\n"
+ " -q --quiet Do not show status information\n"
+ " -i --interface=INTERFACE Block until at least these interfaces have appeared\n",
+ program_invocation_short_name);
+
+ return 0;
+}
+
+static int parse_argv(int argc, char *argv[]) {
+
+ enum {
+ ARG_VERSION = 0x100,
+ };
+
+ static const struct option options[] = {
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, ARG_VERSION },
+ { "quiet", no_argument, NULL, 'q' },
+ { "interface", required_argument, NULL, 'i' },
+ {}
+ };
+
+ int c;
+
+ assert(argc >= 0);
+ assert(argv);
+
+ while ((c = getopt_long(argc, argv, "+hq", options, NULL)) >= 0) {
+
+ switch (c) {
+
+ case 'h':
+ return help();
+
+ case 'q':
+ arg_quiet = true;
+ break;
+
+ case ARG_VERSION:
+ puts(PACKAGE_STRING);
+ puts(SYSTEMD_FEATURES);
+ return 0;
+
+ case 'i':
+ if (strv_extend(&arg_interfaces, optarg) < 0)
+ return log_oom();
+
+ break;
+
+ case '?':
+ return -EINVAL;
+
+ default:
+ assert_not_reached("Unhandled option");
+ }
+ }
+
+ return 1;
+}
static bool all_configured(Manager *m) {
_cleanup_free_ unsigned *indices = NULL;
@@ -46,7 +116,7 @@ static bool all_configured(Manager *m) {
if (n <= 0)
return false;
- STRV_FOREACH(ifname, m->expected_links) {
+ STRV_FOREACH(ifname, arg_interfaces) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL, *reply = NULL;
bool found = false;
int index;
@@ -91,7 +161,7 @@ static bool all_configured(Manager *m) {
}
}
- if (!found)
+ if (!found) {
/* link exists, but networkd is not yet aware of it */
return false;
}
@@ -139,6 +209,7 @@ static bool all_configured(Manager *m) {
continue;
} else if (r < 0 || !streq(state, "configured"))
+ /* managed by networkd, but not yet configured */
return false;
/* we wait for at least one link to appear */
@@ -173,35 +244,12 @@ static int newlink_event_handler(sd_rtnl *rtnl, sd_rtnl_message *message, void *
return 1;
}
-static int parse_config_file(Manager *m) {
- static const char fn[] = "/etc/systemd/networkd-wait-online.conf";
- _cleanup_fclose_ FILE *f = NULL;
- int r;
-
- f = fopen(fn, "re");
- if (!f) {
- if (errno == ENOENT)
- return 0;
-
- log_warning("Failed to open configuration file %s: %m", fn);
- return -errno;
- }
-
- r = config_parse(NULL, fn, f, "WaitOnline\0", config_item_perf_lookup,
- (void*) wait_online_gperf_lookup, false, false, m);
- if (r < 0)
- log_warning("Failed to parse configuration file: %s", strerror(-r));
-
- return r;
-}
-
void manager_free(Manager *m) {
if (!m)
return;
sd_event_unref(m->event);
sd_rtnl_unref(m->rtnl);
- strv_free(m->expected_links);
free(m);
}
@@ -212,26 +260,22 @@ int main(int argc, char *argv[]) {
_cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL;
int r, fd, events;
- log_set_target(LOG_TARGET_AUTO);
+ umask(0022);
+
log_parse_environment();
log_open();
- umask(0022);
+ r = parse_argv(argc, argv);
+ if (r <= 0)
+ return r;
- if (argc != 1) {
- log_error("This program takes no arguments.");
- r = -EINVAL;
- goto out;
- }
+ if (arg_quiet)
+ log_set_max_level(LOG_WARNING);
m = new0(Manager, 1);
if (!m)
return log_oom();
- r = parse_config_file(m);
- if (r < 0)
- goto out;
-
r = sd_network_monitor_new(NULL, &monitor);
if (r < 0) {
log_error("Could not create monitor: %s", strerror(-r));
diff --git a/src/network/networkd-wait-online.conf b/src/network/networkd-wait-online.conf
deleted file mode 100644
index fa3d92fe69..0000000000
--- a/src/network/networkd-wait-online.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# See networkd-wait-online.conf(5) for details
-
-[WaitOnline]
-#ExpectedLinks=
diff --git a/src/network/networkd-wait-online.h b/src/network/networkd-wait-online.h
index 463df1616c..91edce1f60 100644
--- a/src/network/networkd-wait-online.h
+++ b/src/network/networkd-wait-online.h
@@ -29,13 +29,9 @@
typedef struct Manager {
sd_event *event;
sd_rtnl *rtnl;
- char **expected_links;
} Manager;
void manager_free(Manager *m);
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
#define _cleanup_manager_free_ _cleanup_(manager_freep)
-
-/* gperf lookup function */
-const struct ConfigPerfItem* wait_online_gperf_lookup(const char *key, unsigned length);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-27 12:53:39 +0000