[systemd-commits] 2 commits - src/main.c src/tmpfiles.c TODO

[Lennart Poettering]

 TODO           |    7 ++-----
 src/main.c     |    5 +++++
 src/tmpfiles.c |    4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 78ab08eb1ae12136f66c0dcf422cd511326bb233
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Feb 19 14:20:16 2011 +0100

    tmpfiles: never clean up block devices

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index c5397ef..917747a 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -303,6 +303,10 @@ static int dir_cleanup(
                         if (S_ISSOCK(s.st_mode) && unix_socket_alive(sub_path))
                                 continue;
 
+                        /* Ignore device nodes */
+                        if (S_ISCHR(s.st_mode) || S_ISBLK(s.st_mode))
+                                continue;
+
                         age = MAX3(timespec_load(&s.st_mtim),
                                    timespec_load(&s.st_atim),
                                    timespec_load(&s.st_ctim));

commit b5c6cf87342bedeb67fbbc4f3f512af1603a461c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Feb 19 14:20:00 2011 +0100

    main: refuse --test as root

diff --git a/TODO b/TODO
index b205a88..48c003a 100644
--- a/TODO
+++ b/TODO
@@ -5,11 +5,10 @@ Bugs:
 * when plymouth is disabled the console password entry stuff seems to be borked
   https://bugzilla.redhat.com/show_bug.cgi?id=655538
 
-* exclude java hsp files by default
-  https://bugzilla.redhat.com/show_bug.cgi?id=527425
-
 Features:
 
+* support "auto" and "comment=systemd.automount" at the same time for an fstab entry
+
 * Make use of UnknownInterface, UnknownObject
 
 * increase password timeout
@@ -124,8 +123,6 @@ External:
 
 * snd-seq should go, https://bugzilla.redhat.com/show_bug.cgi?id=676095
 
-* mount.tmpfs should be optimized, https://bugzilla.redhat.com/show_bug.cgi?id=676100
-
 * gnome-shell python script/glxinfo/is-accelerated wech
 
 * make cryptsetup lower --iter-time
diff --git a/src/main.c b/src/main.c
index 96a282a..d1be83d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1012,6 +1012,11 @@ int main(int argc, char *argv[]) {
         if (parse_argv(argc, argv) < 0)
                 goto finish;
 
+        if (arg_action == ACTION_TEST && geteuid() == 0) {
+                log_error("Don't run test mode as root.");
+                goto finish;
+        }
+
         /* If Plymouth is being run make sure we show the status, so
          * that there's something nice to see when people press Esc */
         if (access("/dev/.systemd/plymouth", F_OK) >= 0)