Add --debug-sandbox option to mkosi-initrd and mkosi-addon

diff --git a/mkosi/addon.py b/mkosi/addon.py
index 9f2786bb82c047747d8d19919eda4cec3d9f9446..9c188e236dc5c2c4cde70f3a1acf4ed88e23fe46 100644 (file)
--- a/mkosi/addon.py
+++ b/mkosi/addon.py
@@ -61,6 +61,8 @@ def main() -> None:
             cmdline += ["--debug"]
         if args.debug_shell:
             cmdline += ["--debug-shell"]
+        if args.debug_sandbox:
+            cmdline += ["--debug-sandbox"]
 
         if os.getuid() == 0:
             cmdline += [

diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index fec4475489fdbab22925185c1ef102d8f65fb648..a4305a17380f8d155f22aa08a00e5fed0d94204e 100644 (file)
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -165,6 +165,12 @@ def initrd_common_args(parser: argparse.ArgumentParser) -> None:
         action="store_true",
         default=False,
     )
+    parser.add_argument(
+        "--debug-sandbox",
+        help="Run mkosi-sandbox with strace",
+        action="store_true",
+        default=False,
+    )
     parser.add_argument(
         "-D",
         "--show-documentation",
@@ -268,6 +274,8 @@ def main() -> None:
             cmdline += ["--debug"]
         if args.debug_shell:
             cmdline += ["--debug-shell"]
+        if args.debug_sandbox:
+            cmdline += ["--debug-sandbox"]
 
         if os.getuid() == 0:
             cmdline += [

diff --git a/mkosi/resources/man/mkosi-addon.1.md b/mkosi/resources/man/mkosi-addon.1.md
index 7e5572a3d3b9216d78ed816296df36033d5e176b..f1417a3775c76c33af7b75e48267f9acbacd7a02 100644 (file)
--- a/mkosi/resources/man/mkosi-addon.1.md
+++ b/mkosi/resources/man/mkosi-addon.1.md
@@ -13,11 +13,11 @@ using mkosi
 
 # DESCRIPTION
 
-`mkosi-addon` is a wrapper on top of `mkosi` to simplify the generation of PE
-addons containing customizations for unified kernel images specific to the
+**mkosi-addon** is a wrapper on top of **mkosi** to simplify the generation of
+PE addons containing customizations for unified kernel images specific to the
 running or local system. Will include entries in `/etc/crypttab` marked with
-`x-initrd.attach`, and `/etc/kernel/cmdline`. Kernel modules and firmwares for the
-running hardware can be included if a local configuration with the option
+`x-initrd.attach`, and `/etc/kernel/cmdline`. Kernel modules and firmwares for
+the running hardware can be included if a local configuration with the option
 `KernelModulesIncludeHost=` is provided.
 
 # OPTIONS
@@ -40,6 +40,9 @@ running hardware can be included if a local configuration with the option
 `--debug-shell=`
 :   Spawn debug shell in sandbox if a sandboxed command fails.
 
+`--debug-sandbox`
+:   Run **mkosi-sandbox** with **strace**.
+
 `--version`
 :   Show package version.
 

diff --git a/mkosi/resources/man/mkosi-initrd.1.md b/mkosi/resources/man/mkosi-initrd.1.md
index 2a1c17f2e45b9f127f0b177ab2f369d1be7a583e..de9d0364cb65bd465af5c648128f8c2825714990 100644 (file)
--- a/mkosi/resources/man/mkosi-initrd.1.md
+++ b/mkosi/resources/man/mkosi-initrd.1.md
@@ -13,7 +13,7 @@ using mkosi
 
 # DESCRIPTION
 
-`mkosi-initrd` is wrapper on top of `mkosi` to simplify the generation of
+**mkosi-initrd** is wrapper on top of **mkosi** to simplify the generation of
 initrds and Unified Kernel Images for the current running system.
 
 # OPTIONS
@@ -46,6 +46,9 @@ initrds and Unified Kernel Images for the current running system.
 `--debug-shell=`
 :   Spawn debug shell in sandbox if a sandboxed command fails.
 
+`--debug-sandbox`
+:   Run **mkosi-sandbox** with **strace**.
+
 `--version`
 :   Show package version.