summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-28 12:35:26 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 15:30:41 +0200
commit1ca53bff529be066982e2c29268c72f73bdd19d1 (patch)
tree1b85590acd8f7ff93a763d38545aa23778757273 /scripts/build
parent1eee15e8527e0b85f00c946caf7fcb57579f2256 (diff)
downloadvyos-live-build-1ca53bff529be066982e2c29268c72f73bdd19d1.tar.gz
vyos-live-build-1ca53bff529be066982e2c29268c72f73bdd19d1.zip
config: obsolete --net-root-* options (except one)
--net-root-path probably needs to go too, but it is being used for something i don't fully understand currently. Gbp-Dch: Short
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/config18
1 files changed, 3 insertions, 15 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 99522aed1..da4ea5b6d 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -95,10 +95,7 @@ USAGE="${PROGRAM} [--apt apt|apt-get|aptitude]\n\
\t [--mirror-chroot-security URL]\n\
\t [--mirror-debian-installer URL]\n\
\t [--mode debian]\n\
-\t [--net-root-filesystem nfs|cfs]\n\
-\t [--net-root-mountoptions OPTION|\"OPTIONS\"]\n\
\t [--net-root-path PATH]\n\
-\t [--net-root-server IP|HOSTNAME]\n\
\t [--net-tarball true|false]\n\
\t [--no-color]\n\
\t [--onie true|false]\n\
@@ -700,12 +697,12 @@ Local_arguments ()
;;
--net-root-filesystem)
- LB_NET_ROOT_FILESYSTEM="${2}"
+ Echo_warning "--net-root-filesystem is an obsolete option"
shift 2
;;
--net-root-mountoptions)
- LB_NET_ROOT_MOUNTOPTIONS="${2}"
+ Echo_warning "--net-root-mountoptions is an obsolete option"
shift 2
;;
@@ -715,7 +712,7 @@ Local_arguments ()
;;
--net-root-server)
- LB_NET_ROOT_SERVER="${2}"
+ Echo_warning "--net-root-server is an obsolete option"
shift 2
;;
@@ -1268,18 +1265,9 @@ LB_LOADLIN="${LB_LOADLIN}"
# \$LB_WIN32_LOADER: set win32-loader
LB_WIN32_LOADER="${LB_WIN32_LOADER}"
-# \$LB_NET_ROOT_FILESYSTEM: set netboot filesystem
-LB_NET_ROOT_FILESYSTEM="${LB_NET_ROOT_FILESYSTEM}"
-
-# \$LB_NET_ROOT_MOUNTOPTIONS: set nfsopts
-LB_NET_ROOT_MOUNTOPTIONS="${LB_NET_ROOT_MOUNTOPTIONS}"
-
# \$LB_NET_ROOT_PATH: set netboot server directory
LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}"
-# \$LB_NET_ROOT_SERVER: set netboot server address
-LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}"
-
# \$LB_NET_TARBALL: set net tarball
LB_NET_TARBALL="${LB_NET_TARBALL}"