diff options
| -rwxr-xr-x | initramfs/mkdxsinitrd | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 3147512f..58508510 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -495,21 +495,16 @@ fi if [ -n "${use_tpm}" ] ; then MISCMODULES="${MISCMODULES} tpm" - OLD_PWD=`pwd` ########## platform-independent stuff ########## # TODO: fix SLX_TPM_PATH stuff SLX_TPM_PATH="$SLX_SHARE_PATH/tpm" - if [ -z "$SLX_TPM_PATH" ] ; then - echo "ERROR: SLX_TPM_PATH is not set." - exit 1 - fi if [ ! -d "$SLX_TPM_PATH" ] ; then echo "ERROR: can't find platform-independent tpm-files: $SLX_TPM_PATH" exit 1 fi - # cd ${SLX_TPM_PATH} + + # copy files with directory-hierarchy for TPM_FILE in $(find ${SLX_TPM_PATH} -type f) ; do - # path="$(dirname $TPM_FILE | cut -c 3-)" path=$(dirname $TPM_FILE | sed "s,$SLX_TPM_PATH,,") mkdir -p ${INSTDIR}/$path cp $TPM_FILE ${INSTDIR}/$path @@ -524,9 +519,7 @@ if [ -n "${use_tpm}" ] ; then exit 1 fi # copy platform-dependent directory structure and files - # cd ${TPM_BINPATH} for TPM_FILE in $(find ${TPM_BINPATH} -type f) ; do - # path="$(dirname $TPM_FILE | cut -c 3-)" path=$(dirname $TPM_FILE | sed "s,${ROOTDIR},,") mkdir -p ${INSTDIR}/$path cp $TPM_FILE ${INSTDIR}/$path @@ -543,18 +536,17 @@ if [ -n "${use_tpm}" ] ; then # trousers and tpm-tools cobi tcsd bin - for tool in tpm_sealdata tpm_changeownerauth tpm_clear \ - tpm_restrictpubek tpm_selftest tpm_setactive \ - tpm_setclearable tpm_setenable tpm_setownable \ - tpm_setpresence tpm_takeownership tpm_version \ - tpm_createek tpm_getpubek tpm_unseal ; do + TPM_TOOLS="tpm_sealdata tpm_changeownerauth tpm_clear + tpm_restrictpubek tpm_selftest tpm_setactive + tpm_setclearable tpm_setenable tpm_setownable + tpm_setpresence tpm_takeownership tpm_version + tpm_createek tpm_getpubek tpm_unseal" + for tool in $TPM_TOOLS ; do cobi $tool bin done # ssh stuff cobi ssh bin cobi scp bin - - # cd $OLD_PWD # just debugging tools, can be safely removed... cobi bash bin |