[systemd-commits] 2 commits - Makefile.am src/nspawn src/shared

[Tom Gundersen]

 Makefile.am            |    1 +
 src/nspawn/nspawn.c    |    2 +-
 src/shared/generator.c |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 77eb82f9f0f60535ab5f585834ed6e66cf39b184
Author: Mike Gilbert <floppym at gentoo.org>
Date:   Sun May 24 16:33:35 2015 -0400

    shared: generator - correct path to systemd-fsck
    
    In generated systemd-fsck-root.service. This would break if rootprefix
    is not /usr/lib/systemd.
    
    [tomegun: flesh out commit message]

diff --git a/Makefile.am b/Makefile.am
index f84a28d..70d4dc0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,6 +188,7 @@ AM_CPPFLAGS = \
 	-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
+	-DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" \
 	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 8128499..807569a 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -61,7 +61,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) {
                 "[Service]\n"
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
-                "ExecStart=/usr/lib/systemd/systemd-fsck %2$s\n"
+                "ExecStart=" SYSTEMD_FSCK_PATH " %2$s\n"
                 "TimeoutSec=0\n",
                 program_invocation_short_name,
                 what,

commit 637aa8a36ce21e0c83466d9b91ee1bfad2404d1c
Author: Umut Tezduyar Lindskog <umut.tezduyar at axis.com>
Date:   Fri May 22 16:02:09 2015 +0200

    nspawn: be verbose about interface names
    
    Allowed interface name is relatively small. Lets not make
    users go in to the source code to figure out what happened.
    
    --machine=debian-tree conflicts with
    --machine=debian-tree2
    
    ex: Failed to add new veth \
             interfaces (host0, vb-debian-tree): File exists

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 5009363..646edea 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2627,7 +2627,7 @@ static int setup_veth(pid_t pid, char iface_name[IFNAMSIZ], int *ifi) {
 
         r = sd_rtnl_call(rtnl, m, 0, NULL);
         if (r < 0)
-                return log_error_errno(r, "Failed to add new veth interfaces: %m");
+                return log_error_errno(r, "Failed to add new veth interfaces (host0, %s): %m", iface_name);
 
         i = (int) if_nametoindex(iface_name);
         if (i <= 0)