diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-09-30 23:12:52 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-09-30 23:12:52 +0200 |
| commit | c869ac450ae286908cfed582b0c51fe327555833 (patch) | |
| tree | 02498611dba6a4fb995dd3a4eef8014b465b5639 | |
| parent | defaults/software.sh: dropbear needs libxcrypt (diff) | |
| download | genkernel-c869ac450ae286908cfed582b0c51fe327555833.tar.gz genkernel-c869ac450ae286908cfed582b0c51fe327555833.tar.bz2 genkernel-c869ac450ae286908cfed582b0c51fe327555833.zip | |
gen_initramfs.sh: append_modprobed(): Adopt changes from sys-apps/baselayout-2.8
In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.
This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
no longer fail if one directory is missing.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
| -rwxr-xr-x | gen_initramfs.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 8f11127c..56d6a035 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -1832,10 +1832,19 @@ append_modprobed() { mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!" cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!" - mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!" + local modprobe_dir + for modprobe_dir in /etc/modprobe.d /lib/modprobe.d + do + if [[ ! -e "${modprobe_dir}" ]]; then + print_info 5 "'${modprobe_dir}' does not exist; Skipping ..." + continue + fi + + mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create '${TDIR}${modprobe_dir}'!" - cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \ - || gen_die "Failed to copy '/etc/modprobe.d'!" + cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null \ + || gen_die "Failed to copy '${modprobe_dir}'!" + done cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!" log_future_cpio_content |