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

[Zbigniew Jędrzejewski-Szmek]

 src/fsck/fsck.c                  |    6 ++++--
 units/systemd-nspawn at .service.in |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d8e40d62ab871a87fde421c4b246bb45bc3cbe2d
Author: Jonathan Liu <net147 at gmail.com>
Date:   Thu May 29 01:17:25 2014 +1000

    units: use KillMode=mixed for systemd-nspawn at .service
    
    This causes the container to shut down cleanly when the service is
    stopped.

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

commit 8d2a6145334257c8a9ceabc9dd52dff06cca818e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon May 26 23:03:11 2014 -0400

    fsck: include device name in the message about missing fsck

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 594f21e..56cb52d 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -301,10 +301,12 @@ int main(int argc, char *argv[]) {
                 r = fsck_exists(type);
                 if (r < 0) {
                         if (r == -ENOENT) {
-                                log_info("fsck.%s doesn't exist, not checking file system.", type);
+                                log_info("fsck.%s doesn't exist, not checking file system on %s",
+                                         type, device);
                                 return EXIT_SUCCESS;
                         } else
-                                log_warning("fsck.%s cannot be used: %s", type, strerror(-r));
+                                log_warning("fsck.%s cannot be used for %s: %s",
+                                            type, device, strerror(-r));
                 }
         }