Renaming usb-hdd binary image type to simply hdd.

This is the first step in conglomerating code for all hdd-ish
image types, independent of the partitioning scheme being used,
and adding future hdd-ish image types for virtualiziation software.

15 files changed, 31 insertions, 31 deletions

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index 0598a848d..27a02235c 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -86,7 +86,7 @@ fi
 lb binary_iso ${*}
 lb binary_net ${*}
 lb binary_tar ${*}
-lb binary_usb ${*}
+lb binary_hdd ${*}
 lb binary_virtual-hdd ${*}
 
 if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 12e072a65..8527c1aae 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -84,7 +84,7 @@ case "${LB_BINARY_IMAGES}" in
 		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
 		;;
 
-	usb*|tar)
+	hdd*|tar)
 		DESTDIR="binary/install"
 		;;
 
@@ -659,7 +659,7 @@ EOF
 	fi
 
 	case "${LB_BINARY_IMAGES}" in
-		usb-hdd)
+		hdd)
 			case "${LB_BINARY_FILESYSTEM}" in
 				fat*)
 					# Creating dist directories
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index 1dc8d82db..8458320b5 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -25,7 +25,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
 Set_defaults
 
 case "${LB_BINARY_IMAGES}" in
-	iso*|usb*)
+	iso*|hdd*)
 		;;
 	*)
 		exit 0
diff --git a/scripts/build/lb_binary_grub b/scripts/build/lb_binary_grub
index 39aca30d3..7cd043b86 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"
 		;;
 
-	usb*|net)
+	hdd*|net)
 		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
@@ -281,7 +281,7 @@ case ${LB_BINARY_IMAGES} in
 		FILES="chroot/usr/lib/grub/*/stage2_eltorito"
 		;;
 
-	usb*|tar)
+	hdd*|tar)
 		FILES="chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2"
 		;;
 esac
diff --git a/scripts/build/lb_binary_grub2 b/scripts/build/lb_binary_grub2
index b0298911b..3be6f06b1 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"
 		;;
 
-	usb*|net)
+	hdd*|net)
 		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
@@ -254,7 +254,7 @@ case ${LB_BINARY_IMAGES} in
 		FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
 		;;
 
-	usb*|tar)
+	hdd*|tar)
 		FILES="chroot/usr/lib/grub/i386-pc/*"
 		;;
 esac
diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes
index ecf8e59bf..9fb29b081 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/lb_binary_includes
@@ -82,7 +82,7 @@ esac
 
 # Working arround vfat limitations
 case "${LB_BINARY_IMAGES}" in
-	usb*)
+	hdd*)
 		case "${LB_BINARY_FILESYSTEM}" in
 			fat*)
 				CP_OPTIONS="-L"
diff --git a/scripts/build/lb_binary_local-includes b/scripts/build/lb_binary_local-includes
index 6ec33ac72..393c5ce74 100755
--- a/scripts/build/lb_binary_local-includes
+++ b/scripts/build/lb_binary_local-includes
@@ -47,7 +47,7 @@ then
 
 	# Removing symlinks
 	case "${LB_BINARY_IMAGES}" in
-		usb*)
+		hdd*)
 			find binary -type l | xargs rm -f
 			;;
 	esac
diff --git a/scripts/build/lb_binary_silo b/scripts/build/lb_binary_silo
index 5834a0b5b..ebe24c051 100755
--- a/scripts/build/lb_binary_silo
+++ b/scripts/build/lb_binary_silo
@@ -31,7 +31,7 @@ fi
 
 # Check image type
 case "${LB_BINARY_IMAGES}" in
-	iso*|usb*|tar)
+	iso*|hdd*|tar)
 		;;
 
 	net)
@@ -223,7 +223,7 @@ fi
 LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
 
 case "${LB_BINARY_IMAGES}" in
-	iso*|usb*)
+	iso*|hdd*)
 		# Copying silo
 		mkdir -p binary/boot
 
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index e6f137872..8fbdee621 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -73,7 +73,7 @@ case "${LB_BINARY_IMAGES}" in
 		_SUFFIX="tftpboot"
 		;;
 
-	usb*)
+	hdd*)
 		_BOOTLOADER="syslinux"
 		_SUFFIX="binary/syslinux"
 		;;
diff --git a/scripts/build/lb_binary_usb b/scripts/build/lb_binary_usb
index ad03caa51..c215e4bef 100755
--- a/scripts/build/lb_binary_usb
+++ b/scripts/build/lb_binary_usb
@@ -24,18 +24,18 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list usb-hdd "${LB_BINARY_IMAGES}"
+if ! In_list hdd-hdd "${LB_BINARY_IMAGES}"
 then
 	exit 0
 fi
 
-Echo_message "Begin building binary usb image..."
+Echo_message "Begin building binary hdd image..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
 
 # Checking stage file
-Check_stagefile .stage/binary_usb
+Check_stagefile .stage/binary_hdd
 
 # Checking lock file
 Check_lockfile .lock
@@ -219,15 +219,15 @@ EOM
 EOF
 
 	rootpartition="$(Chroot chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')"
-	usbdev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')"
-	echo "Root partition is $rootpartition, device is: $usbdev"
+	hdddev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')"
+	echo "Root partition is $rootpartition, device is: $hdddev"
 
 	echo "WAITING..." && read WAIT
 
 #cat > chroot/grub.sh << EOF
 #grub --batch << EOM
 #root $rootpartition
-#setup $usbdev
+#setup $hdddev
 #EOM
 #EOF
 
@@ -289,4 +289,4 @@ Save_cache cache/packages_binary
 Remove_package
 
 # Creating stage file
-Create_stagefile .stage/binary_usb
+Create_stagefile .stage/binary_hdd
diff --git a/scripts/build/lb_binary_yaboot b/scripts/build/lb_binary_yaboot
index 4613b8a19..bd727ee38 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"
 		;;
 
-	usb*|net|tar)
+	hdd*|net|tar)
 		Echo_error "not yet supported, aborting (FIXME)."
 		exit 1
 	;;
@@ -273,7 +273,7 @@ fi
 LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
 
 case "${LB_BINARY_IMAGES}" in
-	iso*|usb*)
+	iso*|hdd*)
 		# Copying yaboot
 		mkdir -p binary/yaboot
 
@@ -290,7 +290,7 @@ case "${LB_BINARY_IMAGES}" in
 		cp -r "${TEMPLATES}"/* binary/yaboot
 
 		case "${LB_BINARY_IMAGES}" in
-			usb*)
+			hdd*)
 				mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
 				echo "root=/dev/ram" > binary/yaboot/yaboot.conf
 				cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index af9c7d9a6..cefafc599 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|usb-hdd]\n\
+\t    [-b|--binary-images iso|iso-hybrid|net|tar|hdd]\n\
 \t    [--binary-filesystem fat16|fat32|ext2|ext3|ext4]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
@@ -133,7 +133,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|usb-hdd]\n\
+\t    [-s|--source-images iso|net|tar|hdd]\n\
 \t    [--swap-file-path PATH]\n\
 \t    [--swap-file-size MB]\n\
 \t    [--syslinux-theme THEME_SUFFIX]\n\
diff --git a/scripts/build/lb_source b/scripts/build/lb_source
index 61a3de2f5..62b016acf 100755
--- a/scripts/build/lb_source
+++ b/scripts/build/lb_source
@@ -52,7 +52,7 @@ lb source_checksums ${*}
 lb source_iso ${*}
 lb source_net ${*}
 lb source_tar ${*}
-lb source_usb ${*}
+lb source_hdd ${*}
 lb source_virtual-hdd ${*}
 
 # Deconfiguring chroot
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index 3a93d247a..6c8124a65 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -25,7 +25,7 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
 Set_defaults
 
 case "${LB_SOURCE_IMAGES}" in
-	iso*|usb*)
+	iso*|hdd*)
 		;;
 
 	*)
diff --git a/scripts/build/lb_source_usb b/scripts/build/lb_source_usb
index 6f2fde750..29e0f28a3 100755
--- a/scripts/build/lb_source_usb
+++ b/scripts/build/lb_source_usb
@@ -29,18 +29,18 @@ then
 	exit 0
 fi
 
-if ! In_list usb-hdd "${LB_SOURCE_IMAGES}"
+if ! In_list hdd-hdd "${LB_SOURCE_IMAGES}"
 then
 	exit 0
 fi
 
-Echo_message "Begin building source usb image..."
+Echo_message "Begin building source hdd image..."
 
 # Requiring stage file
 Require_stagefile .stage/config .stage/source_debian
 
 # Checking stage file
-Check_stagefile .stage/source_usb
+Check_stagefile .stage/source_hdd
 
 # Checking lock file
 Check_lockfile .lock
@@ -139,4 +139,4 @@ fi
 Remove_package
 
 # Creating stage file
-Create_stagefile .stage/source_usb
+Create_stagefile .stage/source_hdd