summaryrefslogtreecommitdiff
path: root/scripts/build/binary_netboot
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2020-04-23 15:44:17 +0200
committerRaphaël Hertzog <hertzog@debian.org>2020-04-23 15:44:17 +0200
commitd414b8fcdb94a2571950bb35dfabbe435670a625 (patch)
tree5c63db40c988842e4f0b25a467aac9c433ed1d11 /scripts/build/binary_netboot
parent1ca53bff529be066982e2c29268c72f73bdd19d1 (diff)
downloadvyos-live-build-d414b8fcdb94a2571950bb35dfabbe435670a625.tar.gz
vyos-live-build-d414b8fcdb94a2571950bb35dfabbe435670a625.zip
config: obsolete --net-root-path
Diffstat (limited to 'scripts/build/binary_netboot')
-rwxr-xr-xscripts/build/binary_netboot22
1 files changed, 3 insertions, 19 deletions
diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot
index bb49bda85..0847bdc60 100755
--- a/scripts/build/binary_netboot
+++ b/scripts/build/binary_netboot
@@ -45,17 +45,9 @@ Acquire_lockfile
rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz
# Creating image file
-ROOT_DIR=$(basename ${LB_NET_ROOT_PATH})
+ROOT_DIR=${LB_MODE}-live
-if [ "${ROOT_DIR}" = "chroot" ]
-then
- mv chroot chroot.tmp
-fi
-
-if [ "${ROOT_DIR}" != "binary" ]
-then
- mv binary ${ROOT_DIR}
-fi
+mv binary ${ROOT_DIR}
mkdir binary.tmp
mv ${ROOT_DIR} tftpboot binary.tmp
@@ -92,15 +84,7 @@ mv * ../
cd "${OLDPWD}"
rmdir binary.tmp
-if [ "${ROOT_DIR}" != "binary" ]
-then
- mv ${ROOT_DIR} binary
-fi
-
-if [ "${ROOT_DIR}" = "chroot" ]
-then
- mv chroot.tmp chroot
-fi
+mv ${ROOT_DIR} binary
# Creating stage file
Create_stagefile