Skip to content

Commit 0357b4b

Browse files
jozzsisergio-correia
authored andcommitted
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.
1 parent 2ad7027 commit 0357b4b

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/luks/dracut/clevis-pin-null/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dracut = dependency('dracut', required: false)
22

33
if dracut.found()
4-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-null'
4+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-null'
55

66
configure_file(
77
input: 'module-setup.sh.in',

src/luks/dracut/clevis-pin-pkcs11/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dracut = dependency('dracut', required: false)
22

33
if dracut.found()
4-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-pkcs11'
4+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-pkcs11'
55

66
configure_file(
77
input: 'module-setup.sh.in',

src/luks/dracut/clevis-pin-sss/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dracut = dependency('dracut', required: false)
22

33
if dracut.found()
4-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-sss'
4+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-sss'
55

66
configure_file(
77
input: 'module-setup.sh.in',

src/luks/dracut/clevis-pin-tang/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dracut = dependency('dracut', required: false)
22

33
if dracut.found()
4-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-tang'
4+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-tang'
55

66
configure_file(
77
input: 'module-setup.sh.in',

src/luks/dracut/clevis-pin-tpm2/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dracut = dependency('dracut', required: false)
22

33
if dracut.found()
4-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-tpm2'
4+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-tpm2'
55

66
configure_file(
77
input: 'module-setup.sh.in',

src/luks/dracut/clevis/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dracut = dependency('dracut', required: false)
22

33
if dracut.found()
4-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name()
4+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name()
55

66
configure_file(
77
input: 'module-setup.sh.in',

src/pins/file/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env.append('PATH',
1818
test('pin-file', find_program('./pin-file'), env: env)
1919

2020
if dracut.found()
21-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-file'
21+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-file'
2222
configure_file(
2323
input: 'dracut.module-setup.sh.in',
2424
output: 'module-setup.sh',

src/pins/template/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif
3535

3636
#%# dracut support
3737
if dracut.found()
38-
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/60' + meson.project_name() + '-pin-@pin@'
38+
dracutdir = dracut.get_pkgconfig_variable('dracutmodulesdir') + '/50' + meson.project_name() + '-pin-@pin@'
3939
#?# In general, substituation is not needed but it's better to
4040
#?# stay flexible.
4141
configure_file(

0 commit comments

Comments
 (0)