[systemd-devel] [PATCH] nspawn: require /etc/os-release only for init

Vincent Batts vbatts at redhat.com
Sun Feb 9 01:49:19 PST 2014


/etc/os-release is expected for the case for booting a full system, and
need not be required for thin container execution.
---
  src/nspawn/nspawn.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index f904ebe..cf03a40 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1200,7 +1200,7 @@ int main(int argc, char *argv[]) {
                  goto finish;
          }
  
-        if (path_is_os_tree(arg_directory) <= 0) {
+        if (arg_boot && path_is_os_tree(arg_directory) <= 0) {
                  log_error("Directory %s doesn't look like an OS root directory (/etc/os-release is missing). Refusing.", arg_directory);
                  goto finish;
          }
-- 
1.8.4

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/systemd-devel/attachments/20140209/099b29f2/attachment.pgp>


More information about the systemd-devel mailing list