diff options
| author | Jesse Hathaway <jesse@mbuki-mvuki.org> | 2007-10-31 09:59:01 -0400 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:28 +0100 |
| commit | 5cc7f0d887f5af67c5405ee92306690cd884baab (patch) | |
| tree | bff240369061d91592eeed802a1d0f73d330c49e /helpers | |
| parent | d896f1dd21c9c3efd193599352295bf79e16b6ec (diff) | |
| download | vyos-live-build-5cc7f0d887f5af67c5405ee92306690cd884baab.tar.gz vyos-live-build-5cc7f0d887f5af67c5405ee92306690cd884baab.zip | |
allow basename of net-root-path to be binary
This is convenient for testing as you can directly export
the build directory, rather than untarring the net image
in another location.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_net | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/helpers/lh_binary_net b/helpers/lh_binary_net index 8c61bcec0..3eb8b677b 100755 --- a/helpers/lh_binary_net +++ b/helpers/lh_binary_net @@ -59,21 +59,28 @@ then fi # Creating image file -if [ "$(basename ${LH_NET_ROOT_PATH})" = "chroot" ] +ROOT_DIR=$(basename ${LH_NET_ROOT_PATH}) +if [ "${ROOT_DIR}" = "chroot" ] then mv chroot chroot.tmp fi -mv binary "$(basename ${LH_NET_ROOT_PATH})" +if [ "${ROOT_DIR}" != "binary" ] +then + mv binary ${ROOT_DIR} +fi cd .. -tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/$(basename ${LH_NET_ROOT_PATH})" "$(basename ${OLDPWD})/tftpboot" +tar cfz binary-net.tar.gz "$(basename ${OLDPWD})/${ROOT_DIR}" "$(basename ${OLDPWD})/tftpboot" mv binary-net.tar.gz "${OLDPWD}" cd "${OLDPWD}" -mv "$(basename ${LH_NET_ROOT_PATH})" binary +if [ "${ROOT_DIR}" != "binary" ] +then + mv ${ROOT_DIR} binary +fi -if [ "$(basename ${LH_NET_ROOT_PATH})" = "chroot" ] +if [ "${ROOT_DIR}" = "chroot" ] then mv chroot.tmp chroot fi |