From: Maria Matejka <mq@ucw.cz>
Date: Fri, 14 Apr 2023 12:00:54 +0000 (+0200)
Subject: Merge commit '231c6385' into thread-next-iface
X-Git-Tag: v3.0-alpha1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc75d3e305ba748dbb81a97cc4c88c68202e7fc5;p=thirdparty%2Fbird.git

Merge commit '231c6385' into thread-next-iface
---

dc75d3e305ba748dbb81a97cc4c88c68202e7fc5
diff --cc sysdep/unix/main.c
index 79db32d32,0d3ec0c07..0337c7559
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@@ -897,15 -888,12 +897,14 @@@ main(int argc, char **argv
    parse_args(argc, argv);
    log_switch(1, NULL, NULL);
  
 +  the_bird_lock();
 +
    random_init();
-   net_init();
    resource_init();
 -  timer_init();
 +  birdloop_init();
    olock_init();
 -  io_init();
    rt_init();
 +  io_init();
    if_init();
  //  roa_init();
    config_init();