From 728ee4dae31dbbbc8cbe342eeb01f89fab4be8e7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Apr 2021 14:43:05 +0200
Subject: [PATCH] mkosi: in UsrOnly=yes mode, generate a mount.usr= kernel
 cmdline switch

So far, we relied on gpt-auto's logic to automatically find the root fs
on the image. This is not supported for finding the /usr partition
though, hence generate a mount.usr= kernel cmdline option to address
this.

(And it's unlikely we'll add auto-discovery for /usr, since we cannot
realistically decide whether its worth waiting for /usr. After all we
*know* we can't proceed without a rootfs, hence it makes sense to
generically wait for one if we never got one configured one. But a /usr
partition is an optional thing, hence it doesn't make sense to wait for
it if we didn#t get told about it)
---
 mkosi/__init__.py | 51 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 64596b968..d4accc588 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -848,7 +848,19 @@ def disable_cow(path: str) -> None:
     run(["chattr", "+C", path], stdout=DEVNULL, stderr=DEVNULL, check=False)
 
 
-def root_partition_name(args: CommandLineArguments, verity: Optional[bool] = False) -> str:
+def root_partition_name(
+    args: Optional[CommandLineArguments],
+    verity: Optional[bool] = False,
+    image_id: Optional[str] = None,
+    image_version: Optional[str] = None,
+    usr_only: Optional[bool] = False,
+) -> str:
+
+    # Support invocation with "args" or with separate parameters (which is useful when invoking it before we allocated a CommandLineArguments object)
+    if args is not None:
+        image_id = args.image_id
+        image_version = args.image_version
+        usr_only = args.usr_only
 
     # We implement two naming regimes for the partitions. If image_id
     # is specified we assume that there's a naming and maybe
@@ -863,15 +875,15 @@ def root_partition_name(args: CommandLineArguments, verity: Optional[bool] = Fal
     # too. The latter is particularly useful for systemd's image
     # dissection logic, which will always pick the newest root or
     # /usr/ partition if multiple exist.
-    if args.image_id is not None:
-        if args.image_version is not None:
-            return f"{args.image_id}_{args.image_version}"
+    if image_id is not None:
+        if image_version is not None:
+            return f"{image_id}_{image_version}"
         else:
-            return args.image_id
+            return image_id
 
     # If no image id is specified we just return a descriptive string
     # for the partition.
-    prefix = "System Resources" if args.usr_only else "Root"
+    prefix = "System Resources" if usr_only else "Root"
     if verity:
         return prefix + " Verity"
     return prefix + " Partition"
@@ -5595,6 +5607,19 @@ def strip_suffixes(path: str) -> str:
     return t
 
 
+def xescape(s: str) -> str:
+    "Escape a string udev-style, for inclusion in /dev/disk/by-*/* symlinks"
+
+    ret = ""
+    for c in s:
+        if ord(c) <= 32 or ord(c) >= 127 or c == "/":
+            ret = ret + "\\x%02x" % ord(c)
+        else:
+            ret = ret + str(c)
+
+    return ret
+
+
 def build_auxiliary_output_path(path: str, suffix: str, xz: Optional[bool] = False) -> str:
     return strip_suffixes(path) + suffix + (".xz" if xz else "")
 
@@ -5903,6 +5928,20 @@ def load_args(args: argparse.Namespace) -> CommandLineArguments:
     if args.qemu_headless and "console=ttyS0" not in args.kernel_command_line:
         args.kernel_command_line.append("console=ttyS0")
 
+    if args.bootable and args.usr_only and not args.verity:
+        # GPT auto-discovery on empty kernel command lines only looks
+        # for root partitions (in order to avoid ambiguities), if we
+        # shall operate without one (and only have a /usr partition)
+        # we thus need to explicitly say which partition to mount.
+        args.kernel_command_line.append(
+            "mount.usr=/dev/disk/by-partlabel/"
+            + xescape(
+                root_partition_name(
+                    args=None, image_id=args.image_id, image_version=args.image_version, usr_only=args.usr_only
+                )
+            )
+        )
+
     if args.bootable and args.distribution == Distribution.mageia:
         # TODO: Remove once dracut 045 is available in mageia.
         args.kernel_command_line.append("root=/dev/gpt-auto-root")
-- 
2.47.2