From 14f11b628f057366357ade63d62056dd27597792 Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Sun, 31 Aug 2025 02:13:10 -0400 Subject: [PATCH] dracut: move the dracut module to 50 ordering (from 60) Follow the recommended dracut module ordering for out-of-tree modules. For dracut release v108 or later the recommended ordering for out out of tree modules is 50-59 range. The following is a section from dracut documentation: > Not using the 50-59 range for out of tree dracut modules will likely > lead to unintended errors in the initramfs generation process as your > dracut module will either run too early or too late in the generation process. > You have been warned. --- src/luks/dracut/clevis-pin-null/meson.build | 2 +- src/luks/dracut/clevis-pin-pkcs11/meson.build | 2 +- src/luks/dracut/clevis-pin-sss/meson.build | 2 +- src/luks/dracut/clevis-pin-tang/meson.build | 2 +- src/luks/dracut/clevis-pin-tpm2/meson.build | 2 +- src/luks/dracut/clevis/meson.build | 2 +- src/pins/file/meson.build | 2 +- src/pins/template/meson.build | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/luks/dracut/clevis-pin-null/meson.build b/src/luks/dracut/clevis-pin-null/meson.build index 107e3baa..57278f72 100644 --- a/src/luks/dracut/clevis-pin-null/meson.build +++ b/src/luks/dracut/clevis-pin-null/meson.build @@ -1,7 +1,7 @@ dracut = dependency('dracut', required: false) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-null' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-null' configure_file( input: 'module-setup.sh.in', diff --git a/src/luks/dracut/clevis-pin-pkcs11/meson.build b/src/luks/dracut/clevis-pin-pkcs11/meson.build index cfad06e5..689222be 100644 --- a/src/luks/dracut/clevis-pin-pkcs11/meson.build +++ b/src/luks/dracut/clevis-pin-pkcs11/meson.build @@ -1,7 +1,7 @@ dracut = dependency('dracut', required: false) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-pkcs11' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-pkcs11' configure_file( input: 'module-setup.sh.in', diff --git a/src/luks/dracut/clevis-pin-sss/meson.build b/src/luks/dracut/clevis-pin-sss/meson.build index a416b81d..c652a9ed 100644 --- a/src/luks/dracut/clevis-pin-sss/meson.build +++ b/src/luks/dracut/clevis-pin-sss/meson.build @@ -1,7 +1,7 @@ dracut = dependency('dracut', required: false) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-sss' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-sss' configure_file( input: 'module-setup.sh.in', diff --git a/src/luks/dracut/clevis-pin-tang/meson.build b/src/luks/dracut/clevis-pin-tang/meson.build index b50a966f..8e1cfcab 100644 --- a/src/luks/dracut/clevis-pin-tang/meson.build +++ b/src/luks/dracut/clevis-pin-tang/meson.build @@ -1,7 +1,7 @@ dracut = dependency('dracut', required: false) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-tang' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-tang' configure_file( input: 'module-setup.sh.in', diff --git a/src/luks/dracut/clevis-pin-tpm2/meson.build b/src/luks/dracut/clevis-pin-tpm2/meson.build index 693e106c..7863f8ba 100644 --- a/src/luks/dracut/clevis-pin-tpm2/meson.build +++ b/src/luks/dracut/clevis-pin-tpm2/meson.build @@ -1,7 +1,7 @@ dracut = dependency('dracut', required: false) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-tpm2' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-tpm2' configure_file( input: 'module-setup.sh.in', diff --git a/src/luks/dracut/clevis/meson.build b/src/luks/dracut/clevis/meson.build index b05bc101..92f4efac 100644 --- a/src/luks/dracut/clevis/meson.build +++ b/src/luks/dracut/clevis/meson.build @@ -1,7 +1,7 @@ dracut = dependency('dracut', required: false) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() configure_file( input: 'module-setup.sh.in', diff --git a/src/pins/file/meson.build b/src/pins/file/meson.build index ff16acbf..dbd9a56f 100644 --- a/src/pins/file/meson.build +++ b/src/pins/file/meson.build @@ -18,7 +18,7 @@ env.append('PATH', test('pin-file', find_program('./pin-file'), env: env) if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-file' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-file' configure_file( input: 'dracut.module-setup.sh.in', output: 'module-setup.sh', diff --git a/src/pins/template/meson.build b/src/pins/template/meson.build index 49a31c69..e307526d 100644 --- a/src/pins/template/meson.build +++ b/src/pins/template/meson.build @@ -35,7 +35,7 @@ endif #%# dracut support if dracut.found() - dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-@pin@' + dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-@pin@' #?# In general, substituation is not needed but it's better to #?# stay flexible. configure_file(