diff options
| -rwxr-xr-x | functions/configuration.sh | 6 | ||||
| -rw-r--r-- | manpages/en/lb_config.1 | 23 | ||||
| -rwxr-xr-x | scripts/build/binary_grub-legacy | 6 | ||||
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 6 | ||||
| -rwxr-xr-x | scripts/build/config | 24 |
5 files changed, 4 insertions, 61 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh index be3adf621..3fb6d6fe8 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -472,7 +472,6 @@ Prepare_config () LB_NET_ROOT_FILESYSTEM="${LB_NET_ROOT_FILESYSTEM:-nfs}" LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH:-/srv/${LB_MODE}-live}" LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER:-192.168.1.1}" - LB_NET_COW_FILESYSTEM="${LB_NET_COW_FILESYSTEM:-nfs}" LB_NET_TARBALL="${LB_NET_TARBALL:-true}" LB_ONIE="${LB_ONIE:-false}" @@ -697,11 +696,6 @@ Validate_config_permitted_values () exit 1 fi - if ! In_list "${LB_NET_COW_FILESYSTEM}" nfs cfs; then - Echo_error "You have specified an invalid value for LB_NET_COW_FILESYSTEM (--net-cow-filesystem)." - exit 1 - fi - if ! In_list "${LB_NET_ROOT_FILESYSTEM}" nfs cfs; then Echo_error "You have specified an invalid value for LB_NET_ROOT_FILESYSTEM (--net-root-filesystem)." exit 1 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 6ed12264c..8ef86e98e 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -164,14 +164,6 @@ .br [\fB\-\-mode\fR debian] .br - [\fB\-\-net\-cow\-filesystem\fR nfs|cfs] -.br - [\fB\-\-net\-cow\-mountoptions\fR \fIOPTION\fR|"\fIOPTIONS\fR"] -.br - [\fB\-\-net\-cow\-path\fR \fIPATH\fR] -.br - [\fB\-\-net\-cow\-server\fR \fIIP\fR|\fIHOSTNAME\fR] -.br [\fB\-\-net\-root\-filesystem\fR nfs|cfs] .br [\fB\-\-net\-root\-mountoptions\fR \fIOPTION\fR|"\fIOPTIONS\fR"] @@ -404,21 +396,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\-cow\-filesystem\fR nfs|cfs" 4 -defines the filesystem type for the copy\-on\-write layer and defaults to nfs. -.IP "\fB\-\-net\-cow\-mountoptions\fR \fIOPTIONS\fR" 4 -sets additional options for mounting the copy\-on\-write layer in netboot images and is by default empty. -.IP "\fB\-\-net\-cow\-path\fR \fIPATH\fR" 4 -defines the path to client writable filesystem. Anywhere that \fIclient_mac_address\fR is specified in the path live\-boot will substitute the MAC address of the client delimited with hyphens. -.PP -.IP "" 4 -Example: -.br -/export/hosts/client_mac_address -.br -/export/hosts/00\-16\-D3\-33\-92\-E8 -.IP "\fB\-\-net\-cow\-server\fR \fIIP\fR|\fIHOSTNAME\fR" 4 -sets the IP or hostname that will be configured in the bootloader configuration for the copy\-on\-write filesystem of your netboot image and is by default empty. .IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4 defines the filesystem that will be configured in the bootloader configuration for your netboot image. This defaults to nfs. .IP "\fB\-\-net\-root\-mountoptions\fR \fIOPTIONS\fR" 4 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}" |