denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added fix for bug #134843 from Thomas Raschbacher <lordvan@gentoo.org> for evms and later glibc versions.

Browse Source 
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@402 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 19 years ago
parent 61008c7faa
commit c1b29a86b5
2 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File

38
gen_initramfs.sh
Unescape View File

@ -254,16 +254,31 @@ create_evms2_cpio(){
then then
print_info 1 ' EVMS2: Adding support...' print_info 1 ' EVMS2: Adding support...'
mkdir -p ${TEMP}/initramfs-evms2-temp/lib mkdir -p ${TEMP}/initramfs-evms2-temp/lib
cp -a /lib/ld-* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' cp -a /lib/ld-* "${TEMP}/initramfs-evms2-temp/lib" \
cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' || gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' if [ -n "`ls /lib/libgcc_s*`" ]
cp -a /lib/libpthread* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' then
cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms2-temp/lib" \
cp -a /lib/libevms*so* "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' || gen_die 'Could not copy files for EVMS2!'
cp -a /lib/evms "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!' fi
cp -a /lib/evms/* "${TEMP}/initramfs-evms2-temp/lib/evms" || gen_die 'Could not copy files for EVMS2!' cp -a /lib/libc-* /lib/libc.* "${TEMP}/initramfs-evms2-temp/lib" \
cp -a /etc/evms.conf "${TEMP}/initramfs-evms2-temp/etc" || gen_die 'Could not copy files for EVMS2!' || gen_die 'Could not copy files for EVMS2!'
cp /sbin/evms_activate "${TEMP}/initramfs-evms2-temp/sbin/evms_activate" || gen_die 'Could not copy over evms_activate!' cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initramfs-evms2-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libpthread* "${TEMP}/initramfs-evms2-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libuuid*so* "${TEMP}/initramfs-evms2-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libevms*so* "${TEMP}/initramfs-evms2-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/evms "${TEMP}/initramfs-evms2-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/evms/* "${TEMP}/initramfs-evms2-temp/lib/evms" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /etc/evms.conf "${TEMP}/initramfs-evms2-temp/etc" \
|| gen_die 'Could not copy files for EVMS2!'
cp /sbin/evms_activate "${TEMP}/initramfs-evms2-temp/sbin" \
|| gen_die 'Could not copy over evms_activate!'
# Fix EVMS2 complaining that it can't find the swap utilities. # Fix EVMS2 complaining that it can't find the swap utilities.
# These are not required in the initramfs # These are not required in the initramfs
@ -273,7 +288,8 @@ create_evms2_cpio(){
done done
fi fi
cd "${TEMP}/initramfs-evms2-temp/" cd "${TEMP}/initramfs-evms2-temp/"
find . -print | cpio --quiet -o -H newc | gzip -9 > ${CACHE_CPIO_DIR}/initramfs-evms2.cpio.gz find . -print | cpio --quiet -o -H newc \
| gzip -9 > ${CACHE_CPIO_DIR}/initramfs-evms2.cpio.gz
rm -r "${TEMP}/initramfs-evms2-temp/" rm -r "${TEMP}/initramfs-evms2-temp/"
fi fi
} }

36
gen_initrd.sh
Unescape View File

@ -184,16 +184,32 @@ create_base_initrd_sys() {
mkdir -p ${TEMP}/initrd-temp/lib mkdir -p ${TEMP}/initrd-temp/lib
mkdir -p ${TEMP}/initrd-temp/sbin mkdir -p ${TEMP}/initrd-temp/sbin
mkdir -p ${TEMP}/initrd-temp/etc mkdir -p ${TEMP}/initrd-temp/etc
cp -a /lib/ld-* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' mkdir -p ${TEMP}/initrd-temp/bin
cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' cp -a /lib/ld-* "${TEMP}/initrd-temp/lib" \
cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' || gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libpthread* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' if [ -n "`ls /lib/libgcc_s*`" ]
cp -a /lib/libuuid*so* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' then
cp -a /lib/libevms*so* "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms2-temp/lib" \
cp -a /lib/evms "${TEMP}/initrd-temp/lib" || gen_die 'Could not copy files for EVMS2!' || gen_die 'Could not copy files for EVMS2!'
cp -a /lib/evms/* "${TEMP}/initrd-temp/lib/evms" || gen_die 'Could not copy files for EVMS2!' fi
cp -a /etc/evms.conf "${TEMP}/initrd-temp/etc" || gen_die 'Could not copy files for EVMS2!' cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" \
cp /sbin/evms_activate "${TEMP}/initrd-temp/sbin/evms_activate" || gen_die 'Could not copy over evms_activate!' || gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libdl-* /lib/libdl.* "${TEMP}/initrd-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libpthread* "${TEMP}/initrd-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libuuid*so* "${TEMP}/initrd-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/libevms*so* "${TEMP}/initrd-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/evms "${TEMP}/initrd-temp/lib" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /lib/evms/* "${TEMP}/initrd-temp/lib/evms" \
|| gen_die 'Could not copy files for EVMS2!'
cp -a /etc/evms.conf "${TEMP}/initrd-temp/etc" \
|| gen_die 'Could not copy files for EVMS2!'
cp /sbin/evms_activate "${TEMP}/initrd-temp/sbin" \
|| gen_die 'Could not copy over evms_activate!'
# Fix EVMS2 complaining that it cant find the swap utilities. # Fix EVMS2 complaining that it cant find the swap utilities.
# These are not required in the initrd # These are not required in the initrd
for swap_libs in "${TEMP}/initrd-temp/lib/evms/*/swap*.so" for swap_libs in "${TEMP}/initrd-temp/lib/evms/*/swap*.so"

Write Preview
Loading…
Cancel
Save