image: provide runtime dependencies of cryptsetup in OS image.

This adds nix store paths to the initrd and sysroot of bootable Fedora images.
edgelesssys · Nov 28, 2023 · 2afd2f5 · 2afd2f5
1 parent 74cbf9f
commit 2afd2f5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/image/BUILD.bazel b/image/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@aspect_bazel_lib//lib:copy_file.bzl", "copy_file")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 
@@ -18,3 +19,11 @@ pkg_tar(
     srcs = [":sysroot"],
     visibility = ["//visibility:public"],
 )
+
+copy_file(
+    name = "cryptsetup_closure",
+    src = "@cryptsetup_x86_64-linux//:closure.tar",
+    out = "cryptsetup_closure.tar",
+    allow_symlink = True,
+    visibility = ["//visibility:public"],
+)
diff --git a/image/base/BUILD.bazel b/image/base/BUILD.bazel
@@ -49,6 +49,7 @@ mkosi_image(
     ],
     extra_trees = [
         "//image:sysroot_tar",
+        "//image:cryptsetup_closure",
     ],
     local_mirror = ["@mkosi_rpms//:repo"],
     mkosi_conf = "mkosi.conf",

diff --git a/image/initrd/BUILD.bazel b/image/initrd/BUILD.bazel
@@ -14,6 +14,7 @@ mkosi_image(
     ],
     extra_trees = [
         "//image:sysroot_tar",
+        "//image:cryptsetup_closure",
         "//disk-mapper/cmd:disk-mapper-package.tar",
     ],
     local_mirror = ["@mkosi_rpms//:repo"],

diff --git a/image/system/mkosi.repart/00-esp.conf b/image/system/mkosi.repart/00-esp.conf
@@ -2,5 +2,5 @@
 Type=esp
 Format=vfat
 CopyFiles=/efi:/
-SizeMinBytes=256M
-SizeMaxBytes=512M
+SizeMinBytes=512M
+SizeMaxBytes=1024M