]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: if we can't mark the boot ID RO let's fail 3820/head
authorLennart Poettering <lennart@poettering.net>
Wed, 3 Aug 2016 12:51:05 +0000 (14:51 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 3 Aug 2016 12:52:16 +0000 (14:52 +0200)
It's probably better to be safe here.

src/nspawn/nspawn.c

index b7c2fe9e554288714fef8d0e148b3fecbf882f01..5c6605a08eb15fd57d9a96c943ec58a9b7bffa89 100644 (file)
@@ -1320,7 +1320,7 @@ static int setup_boot_id(const char *dest) {
         if (mount(from, to, NULL, MS_BIND, NULL) < 0)
                 r = log_error_errno(errno, "Failed to bind mount boot id: %m");
         else if (mount(NULL, to, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL) < 0)
-                log_warning_errno(errno, "Failed to make boot id read-only, ignoring: %m");
+                r = log_error_errno(errno, "Failed to make boot id read-only: %m");
 
         (void) unlink(from);
         return r;