[Libreoffice-commits] online.git: kit/Kit.cpp

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Tue Jan 7 20:26:15 UTC 2020


 kit/Kit.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 28acde16e6271cc3712b7785a20722c1a11dde50
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jan 7 18:05:53 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 7 21:25:56 2020 +0100

    Mention the nodev mount flag on failed mknod.
    
    Change-Id: Iafd034149c0c2859a6705f33557d61b0b24a927a
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86372
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index b6446887b..a8855f1c3 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2443,14 +2443,14 @@ void lokit_main(
                       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH,
                       makedev(1, 8)) != 0)
             {
-                LOG_SYS("mknod(" << jailPath.toString() << "/dev/random) failed.");
+                LOG_SYS("mknod(" << jailPath.toString() << "/dev/random) failed. Mount must not use nodev flag.");
             }
 
             if (mknod((jailPath.toString() + "/dev/urandom").c_str(),
                       S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH,
                       makedev(1, 9)) != 0)
             {
-                LOG_SYS("mknod(" << jailPath.toString() << "/dev/urandom) failed.");
+                LOG_SYS("mknod(" << jailPath.toString() << "/dev/random) failed. Mount must not use nodev flag.");
             }
 
             ProcSMapsFile = fopen("/proc/self/smaps", "r");


More information about the Libreoffice-commits mailing list