GNU bug report logs - #38462
[PATCH] linux-boot: Don't ignore flags when mounting root file system.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38462 in the body.
You can then email your comments to 38462 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Guillaume Le Vaillant <glv <at> posteo.net>
Subject: [PATCH] linux-boot: Don't ignore flags when mounting root file system.
Date: Mon,  2 Dec 2019 21:57:34 +0100

* gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
  argument and use it when mounting the root file system.
  (boot-system): Pass the root file system flags to 'mount-root-file-system'.
---
 gnu/build/linux-boot.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 950a3507f2..fcec751f45 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -358,10 +358,10 @@ the last argument of `mknod'."
           (filter-map string->number (scandir "/proc")))))
 
 (define* (mount-root-file-system root type
-                                 #:key volatile-root? options)
-  "Mount the root file system of type TYPE at device ROOT.  If VOLATILE-ROOT?
-is true, mount ROOT read-only and make it an overlay with a writable tmpfs
-using the kernel built-in overlayfs.  OPTIONS indicates the options to use
+                                 #:key volatile-root? (flags 0) options)
+  "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is
+true, mount ROOT read-only and make it an overlay with a writable tmpfs using
+the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use
 to mount ROOT."
 
   (if volatile-root?
@@ -384,7 +384,7 @@ to mount ROOT."
                "lowerdir=/real-root,upperdir=/rw-root/upper,workdir=/rw-root/work"))
       (begin
         (check-file-system root type)
-        (mount root "/root" type 0 options)))
+        (mount root "/root" type flags options)))
 
   ;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts.
   (false-if-exception
@@ -474,6 +474,13 @@ upon error."
              mounts)
         "ext4"))
 
+  (define root-fs-flags
+    (mount-flags->bit-mask (or (any (lambda (fs)
+                                      (and (root-mount-point? fs)
+                                           (file-system-flags fs)))
+                                    mounts)
+                               0)))
+
   (define root-fs-options
     (any (lambda (fs)
            (and (root-mount-point? fs)
@@ -533,6 +540,7 @@ upon error."
               (mount-root-file-system (canonicalize-device-spec root)
                                       root-fs-type
                                       #:volatile-root? volatile-root?
+                                      #:flags root-fs-flags
                                       #:options root-fs-options))
             (mount "none" "/root" "tmpfs"))
 
-- 
2.24.0

Message #10 received at 38462-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 38462-done <at> debbugs.gnu.org
Subject: Re: [bug#38462] [PATCH] linux-boot: Don't ignore flags when mounting
 root file system.
Date: Mon, 09 Dec 2019 15:53:58 +0100

Guillaume Le Vaillant <glv <at> posteo.net> skribis:

> * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
>   argument and use it when mounting the root file system.
>   (boot-system): Pass the root file system flags to 'mount-root-file-system'.

This was pushed as 900ef20b1da66ad71145082c883dc12f31fafa54, closing!

Ludo’.

Message #13 received at 38462 <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 38462 <at> debbugs.gnu.org
Subject: Re: [bug#38462] [PATCH] linux-boot: Don't ignore flags when mounting
 root file system.
Date: Mon, 09 Dec 2019 16:22:44 +0100

Ludovic Courtès skribis:

> Guillaume Le Vaillant <glv <at> posteo.net> skribis:
>
>> * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
>>   argument and use it when mounting the root file system.
>>   (boot-system): Pass the root file system flags to 'mount-root-file-system'.
>
> This was pushed as 900ef20b1da66ad71145082c883dc12f31fafa54, closing!
>
> Ludo’.

These are in fact two similar but different patches. Patch
900ef20b1da66ad71145082c883dc12f31fafa54 added support for the 'options'
field of a file-system definition, whereas this patch adds support for
the 'flags' field.

Message #16 received at 38462-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 38462-done <at> debbugs.gnu.org
Subject: Re: [bug#38462] [PATCH] linux-boot: Don't ignore flags when mounting
 root file system.
Date: Tue, 10 Dec 2019 20:10:57 +0100

Hi,

Guillaume Le Vaillant <glv <at> posteo.net> skribis:

> Ludovic Courtès skribis:
>
>> Guillaume Le Vaillant <glv <at> posteo.net> skribis:
>>
>>> * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
>>>   argument and use it when mounting the root file system.
>>>   (boot-system): Pass the root file system flags to 'mount-root-file-system'.
>>
>> This was pushed as 900ef20b1da66ad71145082c883dc12f31fafa54, closing!
>>
>> Ludo’.
>
> These are in fact two similar but different patches. Patch
> 900ef20b1da66ad71145082c883dc12f31fafa54 added support for the 'options'
> field of a file-system definition, whereas this patch adds support for
> the 'flags' field.

Oops, my bad.  Applied, thanks!

Ludo’.

Message #19 received at 38462 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 38462-done <at> debbugs.gnu.org, 38462 <at> debbugs.gnu.org
Subject: Re: [bug#38462] [PATCH] linux-boot: Don't ignore flags when mounting
 root file system.
Date: Tue, 10 Dec 2019 20:49:47 +0100

Ludovic Courtès <ludo <at> gnu.org> skribis:

> Guillaume Le Vaillant <glv <at> posteo.net> skribis:
>
>> Ludovic Courtès skribis:
>>
>>> Guillaume Le Vaillant <glv <at> posteo.net> skribis:
>>>
>>>> * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
>>>>   argument and use it when mounting the root file system.
>>>>   (boot-system): Pass the root file system flags to 'mount-root-file-system'.
>>>
>>> This was pushed as 900ef20b1da66ad71145082c883dc12f31fafa54, closing!
>>>
>>> Ludo’.
>>
>> These are in fact two similar but different patches. Patch
>> 900ef20b1da66ad71145082c883dc12f31fafa54 added support for the 'options'
>> field of a file-system definition, whereas this patch adds support for
>> the 'flags' field.
>
> Oops, my bad.  Applied, thanks!

Actually no: “make check-system TESTS=basic” fails after that.
Could you take a look?

Thanks in advance,
Ludo’.

Message #25 received at 38462 <at> debbugs.gnu.org (full text, mbox):

From: Guillaume Le Vaillant <glv <at> posteo.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 38462 <at> debbugs.gnu.org
Subject: Re: [bug#38462] [PATCH v2] linux-boot: Don't ignore flags when
 mounting root file system.
Date: Tue, 10 Dec 2019 23:37:25 +0100

[Message part 1 (text/plain, inline)]

Ludovic Courtès skribis:

> Ludovic Courtès <ludo <at> gnu.org> skribis:
>
> Actually no: “make check-system TESTS=basic” fails after that.
> Could you take a look?
>
> Thanks in advance,
> Ludo’.

The attached patch should fix the issue. There was a mix up between the
representations of flags as a list of symbols or as a bit mask.

[0001-linux-boot-Don-t-ignore-flags-when-mounting-root-fil.patch (text/x-patch, attachment)]

Message #28 received at 38462-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Guillaume Le Vaillant <glv <at> posteo.net>
Cc: 38462-done <at> debbugs.gnu.org
Subject: Re: [bug#38462] [PATCH v2] linux-boot: Don't ignore flags when
 mounting root file system.
Date: Thu, 12 Dec 2019 17:55:50 +0100

Hi,

Guillaume Le Vaillant <glv <at> posteo.net> skribis:

> Ludovic Courtès skribis:
>
>> Ludovic Courtès <ludo <at> gnu.org> skribis:
>>
>> Actually no: “make check-system TESTS=basic” fails after that.
>> Could you take a look?
>>
>> Thanks in advance,
>> Ludo’.
>
> The attached patch should fix the issue. There was a mix up between the
> representations of flags as a list of symbols or as a bit mask.

Yeah.

> From f26de9d63a84842029d2393f28f6c96aa2bc766e Mon Sep 17 00:00:00 2001
> From: Guillaume Le Vaillant <glv <at> posteo.net>
> Date: Mon, 2 Dec 2019 21:15:50 +0100
> Subject: [PATCH v2] linux-boot: Don't ignore flags when mounting root file
>  system.
>
> * gnu/build/linux-boot.scm (mount-root-file-system): Add the 'flags' keyword
>   argument and use it when mounting the root file system.
>   (boot-system): Pass the root file system flags to 'mount-root-file-system'.

Applied for good this time, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.