X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnspawn%2Fnspawn.c;h=2bda27edf07472a5e36650b488c2b43afbc5054b;hb=733d15ac7a23c80f2e447f6c2fca0406bc9960db;hp=7f87e37a7f06fad437c43c3e0912a8f235552fc7;hpb=30535c16924a3da7b47ea87190d929d617d95c5a;p=elogind.git diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 7f87e37a7..2bda27edf 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1655,7 +1655,7 @@ static int watch_rtnl(sd_event *event, int recv_fd, union in_addr_union *exposed cmsg = CMSG_FIRSTHDR(&mh); assert(cmsg->cmsg_level == SOL_SOCKET); assert(cmsg->cmsg_type == SCM_RIGHTS); - assert(cmsg->cmsg_len = CMSG_LEN(sizeof(int))); + assert(cmsg->cmsg_len == CMSG_LEN(sizeof(int))); memcpy(&fd, CMSG_DATA(cmsg), sizeof(int)); r = sd_rtnl_open_fd(&rtnl, fd, 1, RTNLGRP_IPV4_IFADDR); @@ -3947,9 +3947,10 @@ int main(int argc, char *argv[]) { _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; char last_char = 0; - sd_notify(false, - "READY=1\n" - "STATUS=Container running."); + sd_notifyf(false, + "READY=1\n" + "STATUS=Container running.\n" + "X_NSPAWN_LEADER_PID=" PID_FMT, pid); r = sd_event_new(&event); if (r < 0) {