mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 21:04:30 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
This patch does two things:
|
|
1) Drops probe-bcache, so now util-linux detecting functionality is used.
|
|
2) Drops bcache-register, moving registering device functionality into rule
|
|
using 'sh'.
|
|
This reduces things that need to be present in initrd, replacing them with
|
|
already existing functionality and reducing overall initrd size.
|
|
|
|
diff --git a/69-bcache.rules b/69-bcache.rules
|
|
index 9cc7f0d..6a52893 100644
|
|
--- a/69-bcache.rules
|
|
+++ b/69-bcache.rules
|
|
@@ -10,16 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end"
|
|
# It recognised bcache (util-linux 2.24+)
|
|
ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found"
|
|
# It recognised something else; bail
|
|
-ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end"
|
|
-
|
|
-# Backing devices: scan, symlink, register
|
|
-IMPORT{program}="probe-bcache -o udev $tempnode"
|
|
-ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
|
|
-ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
|
|
+GOTO="bcache_backing_end"
|
|
|
|
LABEL="bcache_backing_found"
|
|
RUN{builtin}+="kmod load bcache"
|
|
-RUN+="bcache-register $tempnode"
|
|
+RUN+="@shell@ -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
|
|
LABEL="bcache_backing_end"
|
|
|
|
# Cached devices: symlink
|
|
diff --git a/Makefile b/Makefile
|
|
index c824ae3..c5f7309 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -9,7 +9,6 @@ all: make-bcache probe-bcache bcache-super-show bcache-register
|
|
|
|
install: make-bcache probe-bcache bcache-super-show
|
|
$(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
|
|
- $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
|
|
$(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
|
|
$(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
|
|
$(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
|