]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: consider a chroot() environment always offline
authorLennart Poettering <lennart@poettering.net>
Thu, 28 Jan 2016 18:32:07 +0000 (19:32 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 29 Jan 2016 14:16:56 +0000 (15:16 +0100)
src/systemctl/systemctl.c

index f5703af241d21bbb31ac4934c2841bba3cd8d474..c7402b57312dc12393b52eae9312851dd04f219d 100644 (file)
@@ -5792,7 +5792,7 @@ static int is_system_running(int argc, char *argv[], void *userdata) {
         sd_bus *bus;
         int r;
 
-        if (arg_transport == BUS_TRANSPORT_LOCAL && !sd_booted()) {
+        if (running_in_chroot() > 0 || (arg_transport == BUS_TRANSPORT_LOCAL && !sd_booted())) {
                 if (!arg_quiet)
                         puts("offline");
                 return EXIT_FAILURE;
@@ -7642,7 +7642,7 @@ int main(int argc, char*argv[]) {
         if (r <= 0)
                 goto finish;
 
-        if (running_in_chroot() > 0 && arg_action != ACTION_SYSTEMCTL) {
+        if (arg_action != ACTION_SYSTEMCTL && running_in_chroot() > 0) {
                 log_info("Running in chroot, ignoring request.");
                 r = 0;
                 goto finish;