diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-02-14 17:40:43 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:42 +0100 |
| commit | e691015fc0ec2467dbd5740cede6ee31397b3d95 (patch) | |
| tree | 16c9433b2153f49621cdfe851466a3201dd3d79e /helpers/lh_binary_net | |
| parent | de47370362eec2c2490e10dd478c67bae3ba2d49 (diff) | |
| download | vyos-live-build-e691015fc0ec2467dbd5740cede6ee31397b3d95.tar.gz vyos-live-build-e691015fc0ec2467dbd5740cede6ee31397b3d95.zip | |
Correcting path within netboot tarballs.
Diffstat (limited to 'helpers/lh_binary_net')
| -rwxr-xr-x | helpers/lh_binary_net | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 95c9f54f9..3e962c49e 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -130,33 +130,33 @@ then mv binary ${ROOT_DIR} fi -cd .. +mkdir binary.tmp +mv ${ROOT_DIR} tftpboot binary.tmp +cd binary.tmp case "${LH_NET_TARBALL}" in bzip2) - tar cfj binary-net-tar.bz2 "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot" - mv binary-net.tar.bz2 "${OLDPWD}" + tar cfj ../binary-net-tar.bz2 * ;; gzip) if gzip --help | grep -qs "\-\-rsyncable" then - tar cf binary-net.tar "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot" - gzip --rsyncable --best binary-net.tar + tar cf ../binary-net.tar * + gzip --rsyncable --best ../binary-net.tar else - tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot" + tar cfz ../binary-net.tar.gz * fi - - mv binary-net.tar.gz "${OLDPWD}" ;; tar) - tar cf binary-net.tar "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot" - mv binary-net.tar "${OLDPWD}" + tar cf ../binary-net.tar * ;; esac +mv * ../ cd "${OLDPWD}" +rmdir binary.tmp if [ "${ROOT_DIR}" != "binary" ] then |