summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-28 12:25:34 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 15:24:50 +0200
commit1eee15e8527e0b85f00c946caf7fcb57579f2256 (patch)
tree5fada5e1f39d134902fb0884c4d535597a5e6b59 /scripts
parent87b995597ca6804e989f667096a1b726ccddaaa1 (diff)
downloadvyos-live-build-1eee15e8527e0b85f00c946caf7fcb57579f2256.tar.gz
vyos-live-build-1eee15e8527e0b85f00c946caf7fcb57579f2256.zip
config: obsolete unused --net-cow-* options
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_grub-legacy6
-rwxr-xr-xscripts/build/binary_loopback_cfg6
-rwxr-xr-xscripts/build/config24
3 files changed, 4 insertions, 32 deletions
diff --git a/scripts/build/binary_grub-legacy b/scripts/build/binary_grub-legacy
index 7891bba65..9f0078ba6 100755
--- a/scripts/build/binary_grub-legacy
+++ b/scripts/build/binary_grub-legacy
@@ -127,12 +127,6 @@ then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ -n "${LB_NET_COW_PATH}" ]
-then
- Echo_error "Net cow not yet supported on grub-legacy"
- exit 1
-fi
-
LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
# Assembling kernel configuration
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg
index c20a1f289..220e4744f 100755
--- a/scripts/build/binary_loopback_cfg
+++ b/scripts/build/binary_loopback_cfg
@@ -124,12 +124,6 @@ then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
fi
-if [ -n "${LB_NET_COW_PATH}" ]
-then
- Echo_error "Net cow not yet supported on grub"
- exit 1
-fi
-
# Default entries
DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
diff --git a/scripts/build/config b/scripts/build/config
index e572e55d2..99522aed1 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -95,10 +95,6 @@ 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-cow-filesystem nfs|cfs]\n\
-\t [--net-cow-mountoptions OPTION|\"OPTIONS\"]\n\
-\t [--net-cow-path PATH]\n\
-\t [--net-cow-server IP|HOSTNAME]\n\
\t [--net-root-filesystem nfs|cfs]\n\
\t [--net-root-mountoptions OPTION|\"OPTIONS\"]\n\
\t [--net-root-path PATH]\n\
@@ -684,22 +680,22 @@ Local_arguments ()
;;
--net-cow-filesystem)
- LB_NET_COW_FILESYSTEM="${2}"
+ Echo_warning "--net-cow-filesystem is an obsolete option"
shift 2
;;
--net-cow-mountoptions)
- LB_NET_COW_MOUNTOPTIONS="${2}"
+ Echo_warning "--net-cow-mountoptions is an obsolete option"
shift 2
;;
--net-cow-path)
- LB_NET_COW_PATH="${2}"
+ Echo_warning "--net-cow-path is an obsolete option"
shift 2
;;
--net-cow-server)
- LB_NET_COW_SERVER="${2}"
+ Echo_warning "--net-cow-server is an obsolete option"
shift 2
;;
@@ -1284,18 +1280,6 @@ 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_COW_FILESYSTEM: set net client cow filesystem
-LB_NET_COW_FILESYSTEM="${LB_NET_COW_FILESYSTEM}"
-
-# \$LB_NET_COW_MOUNTOPTIONS: set cow mount options
-LB_NET_COW_MOUNTOPTIONS="${LB_NET_COW_MOUNTOPTIONS}"
-
-# \$LB_NET_COW_PATH: set cow directory
-LB_NET_COW_PATH="${LB_NET_COW_PATH}"
-
-# \$LB_NET_COW_SERVER: set cow server
-LB_NET_COW_SERVER="${LB_NET_COW_SERVER}"
-
# \$LB_NET_TARBALL: set net tarball
LB_NET_TARBALL="${LB_NET_TARBALL}"