diff options
| author | Dirk von Suchodoletz | 2006-06-22 20:28:48 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-06-22 20:28:48 +0200 |
| commit | 433deb205ad78b25ba785195870adfea0f49c729 (patch) | |
| tree | 38c45da5d7a12e1b4cfaa2c94245bdbca43d5ee4 | |
| parent | vmware added to servconfig + vmw runtime issues + vmw bugfixes (diff) | |
| download | core-433deb205ad78b25ba785195870adfea0f49c729.tar.gz core-433deb205ad78b25ba785195870adfea0f49c729.tar.xz core-433deb205ad78b25ba785195870adfea0f49c729.zip | |
Ugly bug in ldd prevents in some cases the renaming of the binary. So
the original one will be saved and copied back after building the
initramfs ... should be undone when ldd is fixed ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@248 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | initrd/mkdxsinitrd | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index 865f7b6f..a856e4ab 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -3,11 +3,11 @@ # Description: universal (distro independent) generator for initial # ramdisks for linux diskless clients # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 22-06-2006 # Nico Dietrich # Felix Endres # -# Version: 0.3.2a +# Version: 0.3.2b # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg @@ -125,7 +125,7 @@ else cp ${FPTB} ${INSTDIR}/${DEST} fi # get an idea which libraries are needed -chroot ${ROOTDIR} ldd.server ${FPTB#${ROOTDIR}*} >> ${INSTDIR}/tmp/libraries +chroot ${ROOTDIR} ldd ${FPTB#${ROOTDIR}*} >> ${INSTDIR}/tmp/libraries } # replace copy @@ -293,7 +293,9 @@ mkdir -p ${INSTDIR}/usr/share mkdir -p ${INSTDIR}/etc/sysconfig # temporary ldd for getting library information out of initrd binaries -cp `which ldd` ${ROOTDIR}/usr/bin/ldd.server +# fixme: ugly bug in ldd prevents renaming ... +mv ${ROOTDIR}/usr/bin/ldd ${ROOTDIR}/usr/bin/ldd.orig +cp `which ldd` ${ROOTDIR}/usr/bin/ldd # if still no distro name set, try to find it using significant files if [ -z "${DISTRO}" ] ; then @@ -475,7 +477,9 @@ for lib in `cat ${INSTDIR}/tmp/libraries 2>/dev/null | \ test -e ${INSTDIR}/lib/${baselib} || \ cp /${ROOTDIR}/${lib} ${INSTDIR}/lib done -rm ${ROOTDIR}/usr/bin/ldd.server ${INSTDIR}/tmp/libraries +rm ${INSTDIR}/tmp/libraries +# fixme: ugly ldd bug, see above +mv ${ROOTDIR}/usr/bin/ldd.orig ${ROOTDIR}/usr/bin/ldd # add kernel modules and dependency files if [ -z "$KERNVER" ] ; then |