diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/binary_netboot | 22 | ||||
| -rwxr-xr-x | scripts/build/config | 5 |
2 files changed, 4 insertions, 23 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 diff --git a/scripts/build/config b/scripts/build/config index da4ea5b6d..5690d7ad7 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -707,7 +707,7 @@ Local_arguments () ;; --net-root-path) - LB_NET_ROOT_PATH="${2}" + Echo_warning "--net-root-path is an obsolete option" shift 2 ;; @@ -1265,9 +1265,6 @@ LB_LOADLIN="${LB_LOADLIN}" # \$LB_WIN32_LOADER: set win32-loader LB_WIN32_LOADER="${LB_WIN32_LOADER}" -# \$LB_NET_ROOT_PATH: set netboot server directory -LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}" - # \$LB_NET_TARBALL: set net tarball LB_NET_TARBALL="${LB_NET_TARBALL}" |