sd-rtnl: rework rtnl type system

[elogind.git] / src / nspawn / nspawn.c

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index b637b51f61b8739575ec4c35239644cb793cbb2e..84724d59c9177cae9a16acafb70c4c24f8340525 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -986,7 +986,7 @@ static int setup_kmsg(const char *dest, int kmsg_socket) {
         /* Store away the fd in the socket, so that it stays open as
          * long as we run the child */
         k = sendmsg(kmsg_socket, &mh, MSG_DONTWAIT|MSG_NOSIGNAL);
-        close_nointr_nofail(fd);
+        safe_close(fd);
 
         if (k < 0) {
                 log_error("Failed to send FIFO fd: %m");
@@ -1486,13 +1486,7 @@ static int setup_veth(pid_t pid, char iface_name[IFNAMSIZ]) {
                 return r;
         }
 
-        r = sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "veth");
-        if (r < 0) {
-                log_error("Failed to append netlink kind: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_rtnl_message_open_container(m, IFLA_INFO_DATA);
+        r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "veth");
         if (r < 0) {
                 log_error("Failed to open netlink container: %s", strerror(-r));
                 return r;
@@ -1581,6 +1575,12 @@ static int setup_bridge(const char veth_name[]) {
                 return r;
         }
 
+        r = sd_rtnl_message_link_set_flags(m, IFF_UP, IFF_UP);
+        if (r < 0) {
+                log_error("Failed to set IFF_UP flag: %s", strerror(-r));
+                return r;
+        }
+
         r = sd_rtnl_message_append_string(m, IFLA_IFNAME, veth_name);
         if (r < 0) {
                 log_error("Failed to add netlink interface name field: %s", strerror(-r));
@@ -1751,13 +1751,7 @@ static int setup_macvlan(pid_t pid) {
                         return r;
                 }
 
-                r = sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "macvlan");
-                if (r < 0) {
-                        log_error("Failed to append netlink kind: %s", strerror(-r));
-                        return r;
-                }
-
-                r = sd_rtnl_message_open_container(m, IFLA_INFO_DATA);
+                r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "macvlan");
                 if (r < 0) {
                         log_error("Failed to open netlink container: %s", strerror(-r));
                         return r;
@@ -2298,8 +2292,7 @@ static void loop_remove(int nr, int *image_fd) {
 
         if (image_fd && *image_fd >= 0) {
                 ioctl(*image_fd, LOOP_CLR_FD);
-                close_nointr_nofail(*image_fd);
-                *image_fd = -1;
+                *image_fd = safe_close(*image_fd);
         }
 
         control = open("/dev/loop-control", O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK);
@@ -2334,9 +2327,9 @@ static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
                         _exit(EXIT_FAILURE);
 
                 if (pipe_fds[0] > 2)
-                        close_nointr_nofail(pipe_fds[0]);
+                        safe_close(pipe_fds[0]);
                 if (pipe_fds[1] > 2)
-                        close_nointr_nofail(pipe_fds[1]);
+                        safe_close(pipe_fds[1]);
 
                 nullfd = open("/dev/null", O_RDWR);
                 if (nullfd < 0)
@@ -2349,7 +2342,7 @@ static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
                         _exit(EXIT_FAILURE);
 
                 if (nullfd > 2)
-                        close_nointr_nofail(nullfd);
+                        safe_close(nullfd);
 
                 reset_all_signal_handlers();
                 close_all_fds(NULL, 0);
@@ -2359,8 +2352,7 @@ static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
                 _exit(EXIT_FAILURE);
         }
 
-        close_nointr_nofail(pipe_fds[1]);
-        pipe_fds[1] = -1;
+        pipe_fds[1] = safe_close(pipe_fds[1]);
 
         *rpid = pid;
 
@@ -2368,8 +2360,6 @@ static int spawn_getent(const char *database, const char *key, pid_t *rpid) {
 }
 
 static int change_uid_gid(char **_home) {
-
-        _cleanup_strv_free_ char **passwd = NULL;
         char line[LINE_MAX], *w, *x, *state, *u, *g, *h;
         _cleanup_free_ uid_t *uids = NULL;
         _cleanup_free_ char *home = NULL;
@@ -2543,7 +2533,7 @@ static int change_uid_gid(char **_home) {
         }
 
         r = mkdir_safe(home, 0755, uid, gid);
-        if (r < 0) {
+        if (r < 0 && r != -EEXIST) {
                 log_error("Failed to make home directory: %s", strerror(-r));
                 return r;
         }
@@ -2580,7 +2570,7 @@ int main(int argc, char *argv[]) {
         _cleanup_free_ char *kdbus_domain = NULL, *device_path = NULL, *root_device = NULL, *home_device = NULL, *srv_device = NULL;
         bool root_device_rw = true, home_device_rw = true, srv_device_rw = true;
         _cleanup_close_ int master = -1, kdbus_fd = -1, image_fd = -1;
-        _cleanup_close_pipe_ int kmsg_socket_pair[2] = { -1, -1 };
+        _cleanup_close_pair_ int kmsg_socket_pair[2] = { -1, -1 };
         _cleanup_fdset_free_ FDSet *fds = NULL;
         int r = EXIT_FAILURE, k, n_fd_passed, loop_nr = -1;
         const char *console = NULL;
@@ -2804,15 +2794,13 @@ int main(int argc, char *argv[]) {
                         if (envp[n_env])
                                 n_env ++;
 
-                        close_nointr_nofail(master);
-                        master = -1;
+                        master = safe_close(master);
 
                         close_nointr(STDIN_FILENO);
                         close_nointr(STDOUT_FILENO);
                         close_nointr(STDERR_FILENO);
 
-                        close_nointr_nofail(kmsg_socket_pair[0]);
-                        kmsg_socket_pair[0] = -1;
+                        kmsg_socket_pair[0] = safe_close(kmsg_socket_pair[0]);
 
                         reset_all_signal_handlers();
 
@@ -2822,7 +2810,7 @@ int main(int argc, char *argv[]) {
                         k = open_terminal(console, O_RDWR);
                         if (k != STDIN_FILENO) {
                                 if (k >= 0) {
-                                        close_nointr_nofail(k);
+                                        safe_close(k);
                                         k = -EINVAL;
                                 }
 
@@ -2895,8 +2883,7 @@ int main(int argc, char *argv[]) {
                         if (setup_kmsg(arg_directory, kmsg_socket_pair[1]) < 0)
                                 goto child_fail;
 
-                        close_nointr_nofail(kmsg_socket_pair[1]);
-                        kmsg_socket_pair[1] = -1;
+                        kmsg_socket_pair[1] = safe_close(kmsg_socket_pair[1]);
 
                         if (setup_boot_id(arg_directory) < 0)
                                 goto child_fail;
@@ -2923,8 +2910,7 @@ int main(int argc, char *argv[]) {
                          * it can cgroupify us to that we lack access
                          * to certain devices and resources. */
                         eventfd_write(child_ready_fd, 1);
-                        close_nointr_nofail(child_ready_fd);
-                        child_ready_fd = -1;
+                        child_ready_fd = safe_close(child_ready_fd);
 
                         if (chdir(arg_directory) < 0) {
                                 log_error("chdir(%s) failed: %m", arg_directory);
@@ -3025,8 +3011,7 @@ int main(int argc, char *argv[]) {
 
                         /* Wait until the parent is ready with the setup, too... */
                         eventfd_read(parent_ready_fd, &x);
-                        close_nointr_nofail(parent_ready_fd);
-                        parent_ready_fd = -1;
+                        parent_ready_fd = safe_close(parent_ready_fd);
 
                         if (arg_boot) {
                                 char **a;