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.

19 files changed, 115 insertions, 397 deletions

diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index bccf92626..103bf3823 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -36,7 +36,7 @@
 .br
   [\-a|\fB\-\-architectures\fP \fIARCHITECTURE\fP]
 .br
-  [\-b|\fB\-\-binary\-images\fP iso|iso\-hybrid|netboot|tar|hdd|virtual\-hdd]
+  [\-b|\fB\-\-binary\-images\fP iso|iso\-hybrid|netboot|tar|hdd]
 .br
   [\fB\-\-binary\-filesystem\fP fat16|fat32|ext2|ext3|ext4]
 .br
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 4c7c7c4c2..19a4a2d3b 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -205,8 +205,6 @@ installs syslinux into binary
 build harddisk binary image
 .IP \fBlb_binary_hdd\fP(1) 4
 build binary hdd image
-.IP \fBlb_binary_virtual\-hdd\fP(1) 4
-build binary virtual\-hdd image
 .IP \fBlb_binary_win32\-loader\fP(1) 4
 installs win32\-loader into binary
 .IP \fBlb_binary_yaboot\fP(1) 4
@@ -227,10 +225,8 @@ build source net image
 .IP \fBlb_source_tar\fP(1) 4
 build source tarball
 .IP \fBlb_source_hdd\fP(1) 4
-build source hdd image
-.IP \fBlb_source_virtual\-hdd\fP(1) 4
 .\" FIXME
-build source virtual\-hdd image
+build source hdd image
 
 .SH "CONFIG FILES"
 .\" FIXME
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 7735e5f31..d9e3dac9d 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -31,7 +31,7 @@
 .br
 	[\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR]
 .br
-	[\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|netboot|tar|hdd|virtual\-hdd]
+	[\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|netboot|tar|hdd]
 .br
 	[\fB\-\-binary\-filesystem\fR fat16|fat32|ext2|ext3|ext4]
 .br
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 326152235..5a4d24f9d 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -182,8 +182,6 @@ installs syslinux into binary
 build harddisk binary image
 .IP "\fBlb_binary_hdd\fR(1)" 4
 build binary hdd image
-.IP "\fBlb_binary_virtual\-hdd\fR(1)" 4
-build binary virtual\-hdd image
 .IP "\fBlb_binary_win32\-loader\fR(1)" 4
 installs win32\-loader into binary
 .IP "\fBlb_binary_yaboot\fR(1)" 4
@@ -205,8 +203,6 @@ build source net image
 build source tarball
 .IP "\fBlb_source_hdd\fR(1)" 4
 build source hdd image
-.IP "\fBlb_source_virtual\-hdd\fR(1)" 4
-build source virtual\-hdd image
 .\" FIXME
 
 .SH CONFIG FILES
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index ede601e8a..d983bc409 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:43+0300\n"
+"POT-Creation-Date: 2012-09-26 15:35+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -83,7 +83,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:225
+#: en/lb_testroot.1:21 en/live-build.7:221
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:229
+#: en/lb_testroot.1:24 en/live-build.7:225
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -106,14 +106,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:235
+#: en/lb_testroot.1:28 en/live-build.7:231
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:236
+#: en/lb_testroot.1:29 en/live-build.7:232
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -121,7 +121,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:238
+#: en/lb_testroot.1:31 en/live-build.7:234
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -131,7 +131,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:239
+#: en/lb_testroot.1:32 en/live-build.7:235
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:241
+#: en/lb_testroot.1:34 en/live-build.7:237
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -150,7 +150,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:242
+#: en/lb_testroot.1:35 en/live-build.7:238
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:243
+#: en/lb_testroot.1:36 en/live-build.7:239
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -237,7 +237,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:35
-msgid "  [-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd|virtual-hdd]"
+msgid "  [-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd]"
 msgstr ""
 
 #. type: Plain text
@@ -2466,11 +2466,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:505 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:227
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:507 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:229
 msgid "I<live-config>(7)"
 msgstr ""
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index cb3b1696b..65a2a913f 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:43+0300\n"
+"POT-Creation-Date: 2012-09-26 15:35+0300\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -83,7 +83,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:225
+#: en/lb_testroot.1:21 en/live-build.7:221
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:229
+#: en/lb_testroot.1:24 en/live-build.7:225
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -99,14 +99,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:235
+#: en/lb_testroot.1:28 en/live-build.7:231
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:236
+#: en/lb_testroot.1:29 en/live-build.7:232
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:238
+#: en/lb_testroot.1:31 en/live-build.7:234
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -124,7 +124,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:239
+#: en/lb_testroot.1:32 en/live-build.7:235
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:241
+#: en/lb_testroot.1:34 en/live-build.7:237
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -143,7 +143,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:242
+#: en/lb_testroot.1:35 en/live-build.7:238
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:243
+#: en/lb_testroot.1:36 en/live-build.7:239
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -182,12 +182,12 @@ msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:505 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:227
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:507 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:229
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -1062,151 +1062,129 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:185
 #, no-wrap
-msgid "B<lb_binary_virtual-hdd>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:187
-msgid "build binary virtual-hdd image"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:187
-#, no-wrap
 msgid "B<lb_binary_win32-loader>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:189
+#: en/live-build.7:187
 msgid "installs win32-loader into binary"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:189
+#: en/live-build.7:187
 #, no-wrap
 msgid "B<lb_binary_yaboot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:191
+#: en/live-build.7:189
 msgid "installs yaboot into binary"
 msgstr ""
 
 #. type: SS
-#: en/live-build.7:191
+#: en/live-build.7:189
 #, no-wrap
 msgid "Source commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:190
 #, no-wrap
 msgid "B<lb_source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
+#: en/live-build.7:192
 msgid "download sources"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:192
 #, no-wrap
 msgid "B<lb_source_debian-live>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
+#: en/live-build.7:194
 msgid "copy debian-live config into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:194
 #, no-wrap
 msgid "B<lb_source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:198
+#: en/live-build.7:196
 msgid "install disk information into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:198
+#: en/live-build.7:196
 #, no-wrap
 msgid "B<lb_source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:200
+#: en/live-build.7:198
 msgid "build iso source image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:200
+#: en/live-build.7:198
 #, no-wrap
 msgid "B<lb_source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:202
+#: en/live-build.7:200
 msgid "create source checksums (md5, sha1, and/or sha256)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:202
+#: en/live-build.7:200
 #, no-wrap
 msgid "B<lb_source_net>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:204
+#: en/live-build.7:202
 msgid "build source net image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:204
+#: en/live-build.7:202
 #, no-wrap
 msgid "B<lb_source_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:206
+#: en/live-build.7:204
 msgid "build source tarball"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:206
+#: en/live-build.7:204
 #, no-wrap
 msgid "B<lb_source_hdd>(1)"
 msgstr ""
 
-#. type: Plain text
-#: en/live-build.7:208
-msgid "build source hdd image"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:208
-#, no-wrap
-msgid "B<lb_source_virtual-hdd>(1)"
-msgstr ""
-
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:211
-msgid "build source virtual-hdd image"
+#: en/live-build.7:207
+msgid "build source hdd image"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:212
+#: en/live-build.7:208
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:215
+#: en/live-build.7:211
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1218,7 +1196,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:217
+#: en/live-build.7:213
 msgid ""
 "For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
@@ -1229,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:219
+#: en/live-build.7:215
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1240,7 +1218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:221
+#: en/live-build.7:217
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1253,7 +1231,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:224
+#: en/live-build.7:220
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1261,13 +1239,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:226
+#: en/live-build.7:222
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:227
+#: en/live-build.7:223
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 6342d1a84..bcbd835e8 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:43+0300\n"
+"POT-Creation-Date: 2012-09-26 15:35+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,7 +83,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:225
+#: en/lb_testroot.1:21 en/live-build.7:221
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:229
+#: en/lb_testroot.1:24 en/live-build.7:225
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -106,14 +106,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:235
+#: en/lb_testroot.1:28 en/live-build.7:231
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:236
+#: en/lb_testroot.1:29 en/live-build.7:232
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -121,7 +121,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:238
+#: en/lb_testroot.1:31 en/live-build.7:234
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -131,7 +131,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:239
+#: en/lb_testroot.1:32 en/live-build.7:235
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -139,7 +139,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:241
+#: en/lb_testroot.1:34 en/live-build.7:237
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -150,7 +150,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:242
+#: en/lb_testroot.1:35 en/live-build.7:238
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:243
+#: en/lb_testroot.1:36 en/live-build.7:239
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -237,7 +237,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:35
-msgid "  [-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd|virtual-hdd]"
+msgid "  [-b|B<--binary-images> iso|iso-hybrid|netboot|tar|hdd]"
 msgstr ""
 
 #. type: Plain text
@@ -2466,11 +2466,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:505 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:227
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:507 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:229
 msgid "I<live-config>(7)"
 msgstr ""
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 58c9ff578..fdac6dccc 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:43+0300\n"
+"POT-Creation-Date: 2012-09-26 15:35+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -83,7 +83,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:494 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:225
+#: en/lb_testroot.1:21 en/live-build.7:221
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -91,7 +91,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:501 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:229
+#: en/lb_testroot.1:24 en/live-build.7:225
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -99,14 +99,14 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:509 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:235
+#: en/lb_testroot.1:28 en/live-build.7:231
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:510 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:236
+#: en/lb_testroot.1:29 en/live-build.7:232
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -114,7 +114,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:512 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:238
+#: en/lb_testroot.1:31 en/live-build.7:234
 msgid ""
 "More information about live-build and the Debian Live project can be found "
 "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -124,7 +124,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:513 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:239
+#: en/lb_testroot.1:32 en/live-build.7:235
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:515 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:241
+#: en/lb_testroot.1:34 en/live-build.7:237
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -143,7 +143,7 @@ msgstr ""
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:516 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:242
+#: en/lb_testroot.1:35 en/live-build.7:238
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:517 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:243
+#: en/lb_testroot.1:36 en/live-build.7:239
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -182,12 +182,12 @@ msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:505 en/live-build.7:231
+#: en/lb_config.1:505 en/live-build.7:227
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:507 en/live-build.7:233
+#: en/lb_config.1:507 en/live-build.7:229
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -1062,151 +1062,129 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:185
 #, no-wrap
-msgid "B<lb_binary_virtual-hdd>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:187
-msgid "build binary virtual-hdd image"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:187
-#, no-wrap
 msgid "B<lb_binary_win32-loader>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:189
+#: en/live-build.7:187
 msgid "installs win32-loader into binary"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:189
+#: en/live-build.7:187
 #, no-wrap
 msgid "B<lb_binary_yaboot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:191
+#: en/live-build.7:189
 msgid "installs yaboot into binary"
 msgstr ""
 
 #. type: SS
-#: en/live-build.7:191
+#: en/live-build.7:189
 #, no-wrap
 msgid "Source commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:190
 #, no-wrap
 msgid "B<lb_source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
+#: en/live-build.7:192
 msgid "download sources"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:192
 #, no-wrap
 msgid "B<lb_source_debian-live>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
+#: en/live-build.7:194
 msgid "copy debian-live config into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:194
 #, no-wrap
 msgid "B<lb_source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:198
+#: en/live-build.7:196
 msgid "install disk information into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:198
+#: en/live-build.7:196
 #, no-wrap
 msgid "B<lb_source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:200
+#: en/live-build.7:198
 msgid "build iso source image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:200
+#: en/live-build.7:198
 #, no-wrap
 msgid "B<lb_source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:202
+#: en/live-build.7:200
 msgid "create source checksums (md5, sha1, and/or sha256)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:202
+#: en/live-build.7:200
 #, no-wrap
 msgid "B<lb_source_net>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:204
+#: en/live-build.7:202
 msgid "build source net image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:204
+#: en/live-build.7:202
 #, no-wrap
 msgid "B<lb_source_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:206
+#: en/live-build.7:204
 msgid "build source tarball"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:206
+#: en/live-build.7:204
 #, no-wrap
 msgid "B<lb_source_hdd>(1)"
 msgstr ""
 
-#. type: Plain text
-#: en/live-build.7:208
-msgid "build source hdd image"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:208
-#, no-wrap
-msgid "B<lb_source_virtual-hdd>(1)"
-msgstr ""
-
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:211
-msgid "build source virtual-hdd image"
+#: en/live-build.7:207
+msgid "build source hdd image"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:212
+#: en/live-build.7:208
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:215
+#: en/live-build.7:211
 msgid ""
 "Many live-build commands make use of files in the I<config/> directory to "
 "control what they do. Besides the common I<config/common>, which is used by "
@@ -1218,7 +1196,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:217
+#: en/live-build.7:213
 msgid ""
 "For example, lb_bootstrap_debootstrap uses files named config/bootstrap and "
 "config/bootstrap_debootstrap to read the options it will use. See the man "
@@ -1229,7 +1207,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:219
+#: en/live-build.7:215
 msgid ""
 "Note that live-build will respect environment variables which are present in "
 "the context of the shell it is running. If variables can be read from config "
@@ -1240,7 +1218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:221
+#: en/live-build.7:217
 msgid ""
 "In some rare cases, you may want to have different versions of these files "
 "for different architectures or distributions. If files named config/stage."
@@ -1253,7 +1231,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:224
+#: en/live-build.7:220
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -1261,13 +1239,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:226
+#: en/live-build.7:222
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:227
+#: en/live-build.7:223
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""
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
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index ef0575c2f..45c32d7a9 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -30,7 +30,6 @@
 					<option value="netboot">netboot</option>
 					<option value="tar">tar</option>
 					<option value="hdd">hdd</option>
-					<option value="virtual-hdd">virtual-hdd</option>
 				</select>
 			</td>
 		</tr>