diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2020-01-18 15:44:32 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-01-18 16:02:19 +0000 |
| commit | 835d58417a123948c73c428180ec7bc32fc11080 (patch) | |
| tree | 680d04551af9c25d9b79d2c40f57fad243c806dd | |
| parent | c2d589e0aa67a6d7a5b976d8fd217d92f121bf1f (diff) | |
mkinitramfs: Copy modules.builtin.bin into initramfs
modinfo now prints an error message if modules.builtin.bin (created
by depmod) is missing. Copy it in early if it's present.
Closes: #948257
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rwxr-xr-x | mkinitramfs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkinitramfs b/mkinitramfs index 1ab7f66..1b67a96 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -262,7 +262,9 @@ for d in conf/conf.d etc run scripts ${MODULESDIR}; do done # Copy in modules.builtin and modules.order (not generated by depmod) -for x in modules.builtin modules.order; do +# and modules.builtin.bin (generated by depmod, but too late to avoid +# error messages as in #948257) +for x in modules.builtin modules.builtin.bin modules.order; do if [ -f "${MODULESDIR}/${x}" ]; then cp -p "${MODULESDIR}/${x}" "${DESTDIR}${MODULESDIR}/${x}" fi |