[systemd-commits] 2 commits - src/machine units/systemd-nspawn at .service.in

[Lennart Poettering]

 src/machine/machined.c           |    4 ++++
 units/systemd-nspawn at .service.in |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c480d2f8bc63565e40bd969054ebd97e9e2deca6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 11 21:07:09 2014 +0100

    units: make use of nspawn's --keep-unit switch in systemd-nspawn at .service

diff --git a/units/systemd-nspawn at .service.in b/units/systemd-nspawn at .service.in
index 8e00736..ff36e90 100644
--- a/units/systemd-nspawn at .service.in
+++ b/units/systemd-nspawn at .service.in
@@ -10,7 +10,7 @@ Description=Container %i
 Documentation=man:systemd-nspawn(1)
 
 [Service]
-ExecStart=@bindir@/systemd-nspawn -bjD /var/lib/container/%i
+ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=guest --directory=/var/lib/container/%i
 Type=notify
 
 [Install]

commit b87633c4b20e3221748d6c98336cf6c85123cd66
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Feb 11 21:06:51 2014 +0100

    machined: fix enumeration of existing machines on restart

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 6eeb053..20e6f7c 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -106,6 +106,10 @@ int manager_enumerate_machines(Manager *m) {
                 if (!dirent_is_file(de))
                         continue;
 
+                /* Ignore symlinks that map the unit name to the machine */
+                if (startswith(de->d_name, "unit:"))
+                        continue;
+
                 k = manager_add_machine(m, de->d_name, &machine);
                 if (k < 0) {
                         log_error("Failed to add machine by file name %s: %s", de->d_name, strerror(-k));