[systemd-commits] 2 commits - src/fstab-generator src/login

[Zbigniew Jędrzejewski-Szmek]

 src/fstab-generator/fstab-generator.c |    5 +++++
 src/login/logind-user.c               |    3 ---
 src/login/logind-user.h               |    1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit eb53c37e2eb1ff9e2dbf370985dd53c62a98fa66
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Dec 19 14:16:46 2013 -0500

    logind: remove dead variable
    
    Noticed-by: Jan Alexander Steffens <jan.steffens at gmail.com>

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 441e086..0e46560 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -637,9 +637,6 @@ UserState user_get_state(User *u) {
 
         assert(u);
 
-        if (u->closing)
-                return USER_CLOSING;
-
         if (u->slice_job || u->service_job)
                 return USER_OPENING;
 
diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index 8d5f119..0062880 100644
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -61,7 +61,6 @@ struct User {
 
         bool in_gc_queue:1;
         bool started:1;
-        bool closing:1;
 
         LIST_HEAD(Session, sessions);
         LIST_FIELDS(User, gc_queue);

commit e2f123b97b9af34f39cb18ce0c1c5ef6cb89117e
Author: Thomas Bächler <thomas at archlinux.org>
Date:   Sat Dec 21 11:22:37 2013 +0100

    fstab-generator: Do not try to fsck non-devices
    
    This fixes a regression introduced in 64e70e4 where the mount fails
    when fstab is misconfigured with fs_passno > 0 on a virtual file
    system like nfs, and the type is specified as "auto".

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 1227f08..5480e54 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -152,6 +152,11 @@ static int add_fsck(FILE *f, const char *what, const char *where, const char *ty
         if (passno == 0)
                 return 0;
 
+        if (!is_device_path(what)) {
+                log_warning("Checking was requested for \"%s\", but it is not a device.", what);
+                return 0;
+        }
+
         if (type && !streq(type, "auto")) {
                 int r;
                 const char *checker;