diff options
| author |   Oleg Vinichenko <oleg@funtoo.org> | 2012-12-18 02:39:06 +0000 |
|---|---|---|
| committer | Oleg Vinichenko <oleg@funtoo.org> | 2012-12-18 02:39:06 +0000 |
| commit | 04f38a518b518f2357058010f3cd413e7974235c (patch) | |
| tree | f9beb410f36b2ffd27c84c4798808ce411cc8170 | |
| parent | Fallback to selecting initramfs compression based on kernel image compression (diff) | |
| download | genkernel-04f38a518b518f2357058010f3cd413e7974235c.tar.gz genkernel-04f38a518b518f2357058010f3cd413e7974235c.tar.bz2 genkernel-04f38a518b518f2357058010f3cd413e7974235c.zip | |
FL-193: mdadm tweaksv3.4.40-r2-funtoo
| -rwxr-xr-x | gen_initramfs.sh | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 9810e06..a025f32 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -324,47 +324,47 @@ append_lvm(){ cd "${TEMP}" rm -r "${TEMP}/initramfs-lvm-temp/" } - append_mdadm(){ - if [ -d "${TEMP}/initramfs-mdadm-temp" ] - then - rm -r "${TEMP}/initramfs-mdadm-temp/" - fi - cd ${TEMP} - mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/" - mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/" - if [ "${MDADM}" = '1' ] - then - if [ -n "${MDADM_CONFIG}" ] - then - if [ -f "${MDADM_CONFIG}" ] - then - cp -a "${MDADM_CONFIG}" "${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \ - || gen_die "Could not copy mdadm.conf!" - else - gen_die 'sl${MDADM_CONFIG} does not exist!' - fi - else - print_info 1 ' MDADM: Skipping inclusion of mdadm.conf' - fi - - if [ -e '/sbin/mdadm' ] && LC_ALL="C" ldd /sbin/mdadm | grep -q 'not a dynamic executable' \ - && [ -e '/sbin/mdmon' ] && LC_ALL="C" ldd /sbin/mdmon | grep -q 'not a dynamic executable' - then - print_info 1 ' MDADM: Adding support (using local static binaries /sbin/mdadm and /sbin/mdmon)...' - cp /sbin/mdadm /sbin/mdmon "${TEMP}/initramfs-mdadm-temp/sbin/" || gen_die 'Could not copy over mdadm!' - else - gen_die "Could not find /sbin/mdadm or /sbin/mdmon for initramfs" - fi - fi - cd "${TEMP}/initramfs-mdadm-temp/" - log_future_cpio_content - find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ - || gen_die "compressing mdadm cpio" - cd "${TEMP}" - rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null + if [ -d "${TEMP}/initramfs-mdadm-temp" ] + then + rm -r "${TEMP}/initramfs-mdadm-temp/" + fi + cd ${TEMP} + mkdir -p "${TEMP}/initramfs-mdadm-temp/etc/" + mkdir -p "${TEMP}/initramfs-mdadm-temp/sbin/" + if [ "${MDADM}" = '1' ] + then + if [ -n "${MDADM_CONFIG}" ] + then + if [ -f "${MDADM_CONFIG}" ] + then + cp -a "${MDADM_CONFIG}" "${TEMP}/initramfs-mdadm-temp/etc/mdadm.conf" \ + || gen_die "Could not copy mdadm.conf!" + else + gen_die 'sl${MDADM_CONFIG} does not exist!' + fi + else + print_info 1 ' MDADM: Skipping inclusion of mdadm.conf' + fi + + if [ -e '/sbin/mdadm' ] && LC_ALL="C" ldd /sbin/mdadm | grep -q 'not a dynamic executable' \ + && [ -e '/sbin/mdmon' ] && LC_ALL="C" ldd /sbin/mdmon | grep -q 'not a dynamic executable' + then + print_info 1 ' MDADM: Adding support (using local static binaries /sbin/mdadm and /sbin/mdmon)...' + copy_binaries "${TEMP}/initramfs-mdadm-temp/sbin" /sbin/{mdadm,mdmon} || gen_die 'Could not copy over mdadm!' + else + gen_die "Could not find /sbin/mdadm or /sbin/mdmon for initramfs" + fi + fi + cd "${TEMP}/initramfs-mdadm-temp/" + log_future_cpio_content + find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ + || gen_die "compressing mdadm cpio" + cd "${TEMP}" + rm -rf "${TEMP}/initramfs-mdadm-temp" > /dev/null } + append_zfs(){ if [ -d "${TEMP}/initramfs-zfs-temp" ] then |