diff options
| -rwxr-xr-x | functions/configuration.sh | 7 | ||||
| -rw-r--r-- | manpages/en/lb_config.1 | 12 | ||||
| -rwxr-xr-x | scripts/build/config | 18 |
3 files changed, 3 insertions, 34 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh index 3fb6d6fe8..f3e443c89 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -469,9 +469,7 @@ Prepare_config () ;; esac - 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_TARBALL="${LB_NET_TARBALL:-true}" LB_ONIE="${LB_ONIE:-false}" @@ -696,11 +694,6 @@ Validate_config_permitted_values () 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 - fi - if ! In_list "${LB_SOURCE_IMAGES}" iso netboot tar hdd; then Echo_error "You have specified an invalid value for LB_SOURCE_IMAGES (--source-images)." exit 1 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 8ef86e98e..1d10cc919 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -164,14 +164,8 @@ .br [\fB\-\-mode\fR debian] .br - [\fB\-\-net\-root\-filesystem\fR nfs|cfs] -.br - [\fB\-\-net\-root\-mountoptions\fR \fIOPTION\fR|"\fIOPTIONS\fR"] -.br [\fB\-\-net\-root\-path\fR \fIPATH\fR] .br - [\fB\-\-net\-root\-server\fR \fIIP\fR|\fIHOSTNAME\fR] -.br [\fB\-\-net\-tarball\fR true|false] .br [\fB\-\-no\-color] @@ -396,14 +390,8 @@ 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\-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 -sets additional options for mounting the root filesystem in netboot images and is by default empty. .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\-root\-server\fR \fIIP\fR|\fIHOSTNAME\fR" 4 -sets the IP or hostname that will be configured in the bootloader configuration for the root filesystem of your netboot image. This defaults to 192.168.1.1. .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/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}" |