Merge pull request #167 from alfonsosanchezbeato/snapd-bits-from-run-…

…system bin,debian: include snapd bits from the run system
canonical · May 23, 2023 · be8b34e · be8b34e
2 parents 3935bc0 + 1bfed50
commit be8b34e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/bin/ubuntu-core-initramfs b/bin/ubuntu-core-initramfs
@@ -273,13 +273,15 @@ def add_modules_from_file(dest_d, kernel_root, modules_d, fw_d, conf_file, db,
 
 
 def create_initrd(parser, args):
+    rootfs = "/"
     if not args.kerneldir:
         args.kerneldir = "/lib/modules/%s" % args.kernelver
     if args.root:
         args.skeleton = path_join_make_rel_paths(args.root, args.skeleton)
         args.kerneldir = path_join_make_rel_paths(args.root, args.kerneldir)
         args.firmwaredir = path_join_make_rel_paths(args.root, args.firmwaredir)
         args.output = path_join_make_rel_paths(args.root, args.output)
+        rootfs = args.root
     if args.kernelver:
         args.output = "-".join([args.output, args.kernelver])
     with tempfile.TemporaryDirectory(suffix=".ubuntu-core-initramfs") as d:
@@ -293,9 +295,22 @@ def create_initrd(parser, args):
         subprocess.check_call(["cp", "-ar", args.firmwaredir, firmware])
 
         db = ModuleDb(modules)
-        installed_module = set()
         main = os.path.join(d, "main")
         os.makedirs(main, exist_ok=True)
+        # Copy snapd bits
+        snapd_lib = path_join_make_rel_paths(rootfs, "/usr/lib/snapd")
+        snapd_files = [os.path.join(snapd_lib, "snap-bootstrap"),
+                       os.path.join(snapd_lib, "info"),
+                       "/lib/systemd/system/snapd.recovery-chooser-trigger.service"]
+        for snapd_f in snapd_files:
+            subprocess.check_call(
+                [
+                    "/usr/lib/dracut/dracut-install",
+                    "-D", main,
+                    "--ldd", snapd_f,
+                ]
+            )
+        # Copy features
         for feature in args.features:
             # Add feature files
             feature_path = os.path.join(args.skeleton, feature)

diff --git a/debian/control b/debian/control
@@ -65,15 +65,14 @@ Build-Depends: debhelper-compat (= 13), dh-python, python3:any, dracut-core, qui
                kmod,
                libgcc-s1,
                squashfs-tools,
-               snapd (>= 2.50+20.04),
                systemd-bootchart,
                golang-go, indent, libapparmor-dev, libcap-dev, libfuse-dev, libglib2.0-dev, liblzma-dev, liblzo2-dev, libseccomp-dev, libudev-dev, openssh-client, pkg-config, python3, python3-docutils, python3-markdown, squashfs-tools, tzdata, udev, xfslibs-dev
 Standards-Version: 4.4.1
 Homepage: https://launchpad.net/ubuntu-core-initramfs
 
 Package: ubuntu-core-initramfs
 Architecture: amd64 arm64 armhf riscv64
-Depends: ${python3:Depends}, ${misc:Depends}, dracut-core (>= 051-1), zstd, sbsigntool, linux-firmware, llvm
+Depends: ${python3:Depends}, ${misc:Depends}, dracut-core (>= 051-1), zstd, sbsigntool, snapd (>= 2.50+20.04), linux-firmware, llvm
 Description: standard embedded initrd
  Standard embedded initrd implementation to be used with Ubuntu Core
  systems. Currently targetting creating BLS Type2 like binaries.
diff --git a/debian/rules b/debian/rules
@@ -294,22 +294,15 @@ override_dh_auto_install:
 		/usr/share/plymouth/themes/spinner/*				\
 		/usr/bin/unsquashfs						\
 		/sbin/dmsetup							\
-		/usr/lib/snapd/snap-bootstrap					\
-		/usr/lib/snapd/info						\
 		/lib/systemd/systemd-bootchart					\
-		/lib/systemd/system/snapd.recovery-chooser-trigger.service;	\
+		; \
 	do									\
 		LD_PRELOAD=							\
 		LD_LIBRARY_PATH=$(TEMPLIBDIR)					\
 			/usr/lib/dracut/dracut-install				\
 			-D $(CURDIR)/debian/tmp --ldd $$f;			\
 	done
 	dpkg -L dmsetup | grep rules.d | xargs -L1 /usr/lib/dracut/dracut-install -D $(CURDIR)/debian/tmp --ldd
-ifeq ($(DEB_HOST_ARCH),amd64)
-	-cp $(CURDIR)/factory/usr/lib/snapd/snap-bootstrap $(CURDIR)/debian/tmp/usr/lib/snapd/snap-bootstrap
-else
-	-rm $(CURDIR)/factory/usr/lib/snapd/snap-bootstrap
-endif
 	ln -v -s e2fsck debian/tmp/usr/sbin/fsck.ext4
 
 	set -e; \
@@ -348,5 +341,3 @@ override_dh_makeshlibs:
 	dh_makeshlibs -Xusr/lib/ubuntu-core-initramfs/main
 override_dh_shlibdeps:
 	dh_shlibdeps -Xusr/lib/ubuntu-core-initramfs/main
-override_dh_strip:
-	dh_strip -Xsnap-bootstrap