From b5c6cf87342bedeb67fbbc4f3f512af1603a461c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 19 Feb 2011 14:20:00 +0100 Subject: [PATCH 1/1] main: refuse --test as root --- TODO | 7 ++----- src/main.c | 5 +++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index b205a88f3..48c003a5b 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 96a282a34..d1be83d44 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) -- 2.30.2