Removing virtual-hdd image type.

Rather than a half broken image type, we'll bet our money on having proper
partman recipies support implemented for hdd image types.

Even if we don't make it for wheezy, it's better to not have virtual-hdd
in there and tell users to use the jessie version for proper hdd images.

10 files changed, 4 insertions, 233 deletions

diff --git a/scripts/build/binary b/scripts/build/binary
index 4fbbc096d..4a17b8463 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -86,7 +86,6 @@ lb binary_iso ${@}
 lb binary_netboot ${@}
 lb binary_tar ${@}
 lb binary_hdd ${@}
-lb binary_virtual-hdd ${@}
 
 lb binary_zsync ${@}
 
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index e6ece1457..697707724 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_CHECKSUMS}" = "none" ] || [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_CHECKSUMS}" = "none" ]
 then
 	exit 0
 fi
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index a6ed88b6e..dd8a4d53d 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -24,11 +24,6 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
 if [ "${_DEBUG}" = "true" ]
 then
 	WGET_OPTIONS="${WGET_OPTIONS} --verbose"
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
index 94afac8f9..f01ed8516 100755
--- a/scripts/build/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LB_LINUX_PACKAGES}" = "none" ]
+if [ "${LB_LINUX_PACKAGES}" = "none" ]
 then
 	exit 0
 fi
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
index b62a43754..420d6b427 100755
--- a/scripts/build/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -24,11 +24,6 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
 Echo_message "Begin creating manifest..."
 
 # Requiring stage file
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index d96c778d2..826a12e60 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ]
+if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ]
 then
 	exit 0
 fi
diff --git a/scripts/build/binary_virtual-hdd b/scripts/build/binary_virtual-hdd
deleted file mode 100755
index f8121e625..000000000
--- a/scripts/build/binary_virtual-hdd
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build binary image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if ! In_list virtual-hdd "${LB_BINARY_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building binary virtual-hdd image..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap .build/chroot_proc
-
-# Checking stage file
-Check_stagefile .build/binary_virtual-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-then
-	case "${LB_BINARY_FILESYSTEM}" in
-		ext2|ext3|ext4)
-			Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM}  e2fsprogs
-			;;
-	esac
-fi
-
-# Restoring cache
-Restore_cache cache/packages.binary
-
-# Installing depends
-Install_package
-
-# Remove old binary
-if [ -f binary-virtual.img ]
-then
-	rm -f binary-virtual.img
-fi
-
-Echo_message "Creating virtual disk image..."
-dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LB_HDD_SIZE}
-
-if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-then
-	mv binary-virtual.img chroot
-
-	# hack to recreate mtab from chroot_hacks if its gone for some reason
-	if ! Chroot chroot "test -s /etc/mtab"
-	then
-		Chroot chroot "rm -f /etc/mtab"
-		Chroot chroot "ln -s /proc/mounts /etc/mtab"
-	fi
-
-	case "${LB_BINARY_FILESYSTEM}" in
-		ext2|ext3|ext4)
-			Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F binary-virtual.img"
-			;;
-	esac
-
-	mv chroot/binary-virtual.img ./
-else
-	case "${LB_BINARY_FILESYSTEM}" in
-		ext2|ext3|ext4)
-			mkfs.${LB_BINARY_FILESYSTEM} . -F binary-virtual.img
-			;;
-	esac
-fi
-
-mkdir -p binary.tmp
-${LB_ROOT_COMMAND} mount -o loop binary-virtual.img binary.tmp
-cp -a binary/* binary.tmp
-cp -af binary/.disk* binary.tmp
-
-${LB_ROOT_COMMAND} umount binary.tmp
-rmdir binary.tmp
-
-# Saving cache
-Save_cache cache/packages.binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .build/binary_virtual-hdd
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 7fd5ff2a4..f8650351a 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_WIN32_LOADER}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ]
+if [ "${LB_WIN32_LOADER}" != "true" ]
 then
 	exit 0
 fi
diff --git a/scripts/build/source b/scripts/build/source
index d52e8d41f..b200deb24 100755
--- a/scripts/build/source
+++ b/scripts/build/source
@@ -57,7 +57,6 @@ lb source_checksums ${@}
 lb source_iso ${@}
 lb source_tar ${@}
 lb source_hdd ${@}
-lb source_virtual-hdd ${@}
 
 # Deconfiguring chroot
 lb chroot_archives chroot remove ${@}
diff --git a/scripts/build/source_virtual-hdd b/scripts/build/source_virtual-hdd
deleted file mode 100755
index d37fa9aa0..000000000
--- a/scripts/build/source_virtual-hdd
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build source image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LB_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-if ! In_list virtual-hdd "${LB_SOURCE_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building source virtual-hdd image..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/source_debian
-
-# Checking stage file
-Check_stagefile .build/source_virtual-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-then
-	case "${LB_BINARY_FILESYSTEM}" in
-		ext2|ext3|ext4)
-			Check_package chroot/sbin/mkfs.${LB_BINARY_FILESYSTEM} e2fsprogs
-			;;
-	esac
-fi
-
-# Installing depends
-Install_package
-
-# Remove old source
-if [ -f source-virtual.img ]
-then
-	rm -f source-virtual.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="$(du -ms source | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})"
-dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM}
-
-if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
-then
-	mv source-virtual.img chroot
-
-	case "${LB_BINARY_FILESYSTEM}" in
-		ext2|ext3|ext4)
-			Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F -m 0 source-virtual.img"
-	esac
-
-	mv chroot/source-virtual.img ./
-else
-	case "${LB_BINARY_FILESYSTEM}" in
-		ext2|ext3|ext4)
-			mkfs.${LB_BINARY_FILESYSTEM} -F -m 0 source-virtual.img
-			;;
-	esac
-fi
-
-mkdir -p source.tmp
-${LB_ROOT_COMMAND} mount -o loop source-virtual.img source.tmp
-cp -r source/* source.tmp
-
-${LB_ROOT_COMMAND} umount source.tmp
-rmdir source.tmp
-
-# Saving cache
-Save_cache cache/packages.binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .build/source_virtual-hdd