summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteinar H. Gunderson <steinar+git@gunderson.no>2024-02-03 10:45:00 +0100
committerSteinar H. Gunderson <sgunderson@bigfoot.com>2024-02-04 14:44:54 +0100
commite9fec00f8624f4858bb269ca8f268652f9b04ddb (patch)
tree48e04bb328f4495cd227c813a09df980f6571258
parentf15633cce1b79e708e9debc21c7b8772df7c7a29 (diff)
Make initramfs hook install mount.bcachefs
Now that the bcachefs tool unconditionally includes the mount parts (or more correctly, you cannot build it at all if you don't have Rust), we can call copy_exec on mount.bcachefs, to get the symlink installed. In particular, this helps with mounting UUID mounts as /. See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060411 for the remaining parts needed in initramfs-tools itself.
-rw-r--r--Makefile1
-rwxr-xr-xinitramfs/hook1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 39234791..80d24ff9 100644
--- a/Makefile
+++ b/Makefile
@@ -214,6 +214,7 @@ install: bcachefs $(optional_install)
sed -i '/^# Note: make install replaces/,$$d' $(DESTDIR)$(INITRAMFS_HOOK)
echo "copy_exec $(ROOT_SBINDIR)/bcachefs /sbin/bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
+ echo "copy_exec $(ROOT_SBINDIR)/mount.bcachefs /sbin/mount.bcachefs" >> $(DESTDIR)$(INITRAMFS_HOOK)
.PHONY: install_systemd
install_systemd: $(systemd_services) $(systemd_libexecfiles)
diff --git a/initramfs/hook b/initramfs/hook
index c172dbdb..00ab52fa 100755
--- a/initramfs/hook
+++ b/initramfs/hook
@@ -25,3 +25,4 @@ add_loaded_modules 'poly1305[-_]*'
# Add the bcachefs utility to the initramfs
# Note: make install replaces this with the install path, so it must be last
#copy_exec /usr/local/sbin/bcachefs /sbin/bcachefs
+#copy_exec /usr/local/sbin/mount.bcachefs /sbin/mount.bcachefs