Renaming net flavour to netboot for consistency.

12 files changed, 29 insertions, 29 deletions

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 4a4f76b9e..564b056c6 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -84,7 +84,7 @@ fi
 
 # Building images
 lb binary_iso ${*}
-lb binary_net ${*}
+lb binary_netboot ${*}
 lb binary_tar ${*}
 lb binary_hdd ${*}
 lb binary_virtual-hdd ${*}
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 28072abb2..59d62e6bd 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -80,7 +80,7 @@ Install_package
 
 # Setting destination directory
 case "${LB_BINARY_IMAGES}" in
-	net)
+	netboot)
 		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
 		;;
 
@@ -100,7 +100,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		;;
 	*)
 		case "${LB_BINARY_IMAGES}" in
-			net)
+			netboot)
 				DI_IMAGE_TYPE="netboot"
 				;;
 
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 4d94716bf..ea2b0fecb 100755
--- a/scripts/build/lb_binary_grub
+++ b/scripts/build/lb_binary_grub
@@ -151,7 +151,7 @@ case "${LB_BINARY_IMAGES}" in
 		DESTDIR_INSTALL="binary/install"
 		;;
 
-	hdd*|net)
+	hdd*|netboot)
 		Echo_warning "Bootloader in this image type not yet supported by live-build."
 		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
 		exit 1
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index d88901d7b..f28cd87c4 100755
--- a/scripts/build/lb_binary_grub2
+++ b/scripts/build/lb_binary_grub2
@@ -125,7 +125,7 @@ case "${LB_BINARY_IMAGES}" in
 		DESTDIR_INSTALL="binary/install"
 		;;
 
-	hdd*|net)
+	hdd*|netboot)
 		Echo_warning "Bootloader in this image type not yet supported by live-build."
 		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
 		exit 1
diff --git a/scripts/build/lb_binary_net b/scripts/build/lb_binary_netboot
index 5d8cdeed7..90669b0e6 100755
--- a/scripts/build/lb_binary_net
+++ b/scripts/build/lb_binary_netboot
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list net "${LB_BINARY_IMAGES}"
+if ! In_list netboot "${LB_BINARY_IMAGES}"
 then
 	exit 0
 fi
@@ -40,7 +40,7 @@ Echo_message "Begin building binary netboot image..."
 Require_stagefile .build/config .build/bootstrap
 
 # Checking stage file
-Check_stagefile .build/binary_net
+Check_stagefile .build/binary_netboot
 
 # Checking lock file
 Check_lockfile .lock
@@ -119,7 +119,7 @@ then
 fi
 
 # Remove old binary
-rm -f binary-net.tar.bz2 binary-net.tar.gz binary-net.tar.lz binary-net.tar
+rm -f binary.netboot.tar.bz2 binary.netboot.tar.gz binary.netboot.tar.lz binary.netboot.tar
 
 # Creating image file
 ROOT_DIR=$(basename ${LB_NET_ROOT_PATH})
@@ -142,19 +142,19 @@ cd binary.tmp
 mkdir tftpboot/live
 mv */live/vmlinuz* */live/initrd* tftpboot/live
 
-tar cf ../binary-net.tar *
+tar cf ../binary.netboot.tar *
 
 case "${LB_COMPRESSION}" in
 	bzip2)
-		bzip2 ${BZIP2_OPTIONS} ../binary-net.tar
+		bzip2 ${BZIP2_OPTIONS} ../binary.netboot.tar
 		;;
 
 	gzip)
-		gzip ${GZIP_OPTIONS} ../binary-net.tar
+		gzip ${GZIP_OPTIONS} ../binary.netboot.tar
 		;;
 
 	lzip)
-		lzip ${LZIP_OPTIONS} ../binary-net.tar
+		lzip ${LZIP_OPTIONS} ../binary.netboot.tar
 		;;
 
 	none)
@@ -176,4 +176,4 @@ then
 fi
 
 # Creating stage file
-Create_stagefile .build/binary_net
+Create_stagefile .build/binary_netboot
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index 31a2aad1b..2a9ca5c41 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -34,7 +34,7 @@ case "${LB_BINARY_IMAGES}" in
 	iso*|hdd*|tar)
 		;;
 
-	net)
+	netboot)
 		# silo not required for sparc netbooting
 		exit 0
 		;;
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 6a4842b32..d88a0bf54 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -63,7 +63,7 @@ case "${LB_BINARY_IMAGES}" in
 		esac
 		;;
 
-	net*)
+	netboot)
 		_BOOTLOADER="pxelinux"
 		_TARGET="tftpboot"
 		;;
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index c4e21c88f..ef001ef06 100755
--- a/scripts/build/lb_binary_yaboot
+++ b/scripts/build/lb_binary_yaboot
@@ -158,7 +158,7 @@ case "${LB_BINARY_IMAGES}" in
 		DESTDIR_INSTALL="binary/install"
 		;;
 
-	hdd*|net|tar)
+	hdd*|netboot|tar)
 		Echo_error "not yet supported, aborting (FIXME)."
 		exit 1
 	;;
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 83e5730d3..334a5bfcb 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -141,7 +141,7 @@ do
 done
 
 case "${LB_BINARY_IMAGES}" in
-	net)
+	netboot)
 		if [ ! -f chroot/sbin/mount.cifs ]
 		then
 			Apt chroot install cifs-utils
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 8b6a3ad37..41d427b66 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -40,7 +40,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--apt-secure true|false]\n\
 \t    [--apt-source-archives true|false]\n\
 \t    [-a|--architectures ARCHITECTURE]\n\
-\t    [-b|--binary-images iso|iso-hybrid|net|tar|hdd]\n\
+\t    [-b|--binary-images iso|iso-hybrid|netboot|tar|hdd]\n\
 \t    [--binary-filesystem fat16|fat32|ext2|ext3|ext4]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
@@ -135,7 +135,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
 \t    [--security true|false]\n\
 \t    [--source true|false]\n\
-\t    [-s|--source-images iso|net|tar|hdd]\n\
+\t    [-s|--source-images iso|netboot|tar|hdd]\n\
 \t    [--firmware-binary true|false]\n\
 \t    [--firmware-chroot true|false]\n\
 \t    [--swap-file-path PATH]\n\
diff --git a/scripts/build/lb_source b/scripts/build/lb_source
index 928e88bfa..b1fa79808 100755
--- a/scripts/build/lb_source
+++ b/scripts/build/lb_source
@@ -55,7 +55,7 @@ lb source_checksums ${*}
 
 # Building images
 lb source_iso ${*}
-lb source_net ${*}
+lb source_netboot ${*}
 lb source_tar ${*}
 lb source_hdd ${*}
 lb source_virtual-hdd ${*}
diff --git a/scripts/build/lb_source_net b/scripts/build/lb_source_netboot
index 9a1829e8f..4882866ca 100755
--- a/scripts/build/lb_source_net
+++ b/scripts/build/lb_source_netboot
@@ -14,7 +14,7 @@ set -e
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
 # Setting static variables
-DESCRIPTION="$(Echo 'build source net image')"
+DESCRIPTION="$(Echo 'build source netboot image')"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
@@ -29,7 +29,7 @@ then
 	exit 0
 fi
 
-if ! In_list net "${LB_SOURCE_IMAGES}"
+if ! In_list netboot "${LB_SOURCE_IMAGES}"
 then
 	exit 0
 fi
@@ -40,7 +40,7 @@ Echo_message "Begin building source netboot image..."
 Require_stagefile .build/config .build/source_debian
 
 # Checking stage file
-Check_stagefile .build/source_net
+Check_stagefile .build/source_netboot
 
 # Checking lock file
 Check_lockfile .lock
@@ -49,21 +49,21 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Remove old source
-rm -f source-net.tar.bz2 source-net.tar.gz source-net.tar.lz source-net.tar
+rm -f source.netboot.tar.bz2 source.netboot.tar.gz source.netboot.tar.lz source.netboot.tar
 
-tar cf source-net.tar source
+tar cf source.netboot.tar source
 
 case "${_COMPRESSION}" in
 	bzip2)
-		bzip2 ${BZIP2_OPTIONS} source-net.tar
+		bzip2 ${BZIP2_OPTIONS} source.netboot.tar
 		;;
 
 	gzip)
-		gzip ${GZIP_OPTIONS} source-net.tar
+		gzip ${GZIP_OPTIONS} source.netboot.tar
 		;;
 
 	lzip)
-		lzip ${LZIP_OPTIONS} source-net.tar
+		lzip ${LZIP_OPTIONS} source.netboot.tar
 		;;
 
 	none)
@@ -71,4 +71,4 @@ case "${_COMPRESSION}" in
 esac
 
 # Creating stage file
-Create_stagefile .build/source_net
+Create_stagefile .build/source_netboot