config: obsolete --net-root-path

4 files changed, 4 insertions, 28 deletions

diff --git a/functions/configuration.sh b/functions/configuration.sh
index f3e443c89..0c25673d6 100755
--- a/functions/configuration.sh
+++ b/functions/configuration.sh
@@ -469,7 +469,6 @@ Prepare_config ()
 			;;
 	esac
 
-	LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH:-/srv/${LB_MODE}-live}"
 	LB_NET_TARBALL="${LB_NET_TARBALL:-true}"
 
 	LB_ONIE="${LB_ONIE:-false}"
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 1d10cc919..ece1e5b52 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -164,8 +164,6 @@
 .br
 	[\fB\-\-mode\fR debian]
 .br
-	[\fB\-\-net\-root\-path\fR \fIPATH\fR]
-.br
 	[\fB\-\-net\-tarball\fR true|false]
 .br
 	[\fB\-\-no\-color]
@@ -390,8 +388,6 @@ sets the location of the debian security package mirror that will be used to fet
 sets the location of the mirror that will be used to fetch the debian installer images of the derivative. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-mirror\-chroot.
 .IP "\fB\-\-mode\fR debian" 4
 defines a global mode to load project specific defaults. By default this is set to debian.
-.IP "\fB\-\-net\-root\-path\fR \fIPATH\fR" 4
-sets the file path that will be configured in the bootloader configuration for your netboot image. This defaults to /srv/debian\-live in debian mode.
 .IP "\fB\-\-net\-tarball\fR true|false" 4
 defines if a compressed tarball should be created. Disabling this options leads to no tarball at all, the plain binary directory is considered the output in this case. Default is true.
 .IP "\fB\-\-no\-color\fR" 4
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}"