networkd-wait-online: allow specific devices to be ignored

[elogind.git] / src / network / networkd-wait-online.c

diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index d588935e9353ebc67d45d5a906012d94ea879169..826ab929cc5bb5af17d9ab4e9d505461e436f58d 100644 (file)
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -29,24 +29,24 @@
 
 static bool arg_quiet = false;
 static char **arg_interfaces = NULL;
+static char **arg_ignore = NULL;
 
-static int help(void) {
-
+static void 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;
+               "  -i --interface=INTERFACE  Block until at least these interfaces have appeared\n"
+               "     --ignore=INTERFACE     Don't take these interfaces into account\n"
+               , program_invocation_short_name);
 }
 
 static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_VERSION = 0x100,
+                ARG_IGNORE,
         };
 
         static const struct option options[] = {
@@ -54,6 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "version",         no_argument,       NULL, ARG_VERSION },
                 { "quiet",           no_argument,       NULL, 'q'         },
                 { "interface",       required_argument, NULL, 'i'         },
+                { "ignore",          required_argument, NULL, ARG_IGNORE  },
                 {}
         };
 
@@ -62,12 +63,13 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "+hq", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "+hiq", options, NULL)) >= 0)
 
                 switch (c) {
 
                 case 'h':
-                        return help();
+                        help();
+                        return 0;
 
                 case 'q':
                         arg_quiet = true;
@@ -84,13 +86,18 @@ static int parse_argv(int argc, char *argv[]) {
 
                         break;
 
+                case ARG_IGNORE:
+                        if (strv_extend(&arg_ignore, optarg) < 0)
+                                return log_oom();
+
+                        break;
+
                 case '?':
                         return -EINVAL;
 
                 default:
                         assert_not_reached("Unhandled option");
                 }
-        }
 
         return 1;
 }
@@ -114,9 +121,9 @@ int main(int argc, char *argv[]) {
 
         assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
 
-        r = manager_new(&m, arg_interfaces);
+        r = manager_new(&m, arg_interfaces, arg_ignore);
         if (r < 0) {
-                log_error("Could not create manager: %s", strerror(-r));
+                log_error_errno(r, "Could not create manager: %m");
                 goto finish;
         }
 
@@ -131,12 +138,15 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_loop(m->event);
         if (r < 0) {
-                log_error("Event loop failed: %s", strerror(-r));
+                log_error_errno(r, "Event loop failed: %m");
                 goto finish;
         }
 
 finish:
         sd_notify(false, "STATUS=All interfaces configured...");
 
+        strv_free(arg_interfaces);
+        strv_free(arg_ignore);
+
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }