Dropping sparc bootloader support (silo), there is nobody actively maintaining this in live-build.

12 files changed, 92 insertions, 443 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4531551e1..17ddc164d 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -853,10 +853,6 @@ Set_defaults ()
 			powerpc)
 				LB_BOOTLOADER="yaboot"
 				;;
-
-			sparc)
-				LB_BOOTLOADER="silo"
-				;;
 		esac
 	fi
 
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index ac918be8c..472cc121d 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -195,8 +195,6 @@ installs a memtest into binary
 build netboot binary image
 .IP \fBlb_binary_rootfs\fP(1) 4
 build rootfs image
-.IP \fBlb_binary_silo\fP(1) 4
-installs silo into binary
 .IP \fBlb_binary_syslinux\fP(1) 4
 installs syslinux into binary
 .IP \fBlb_binary_tar\fP(1) 4
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 90e2d2d0e..440325350 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -172,8 +172,6 @@ installs a memtest into binary
 build netboot binary image
 .IP "\fBlb_binary_rootfs\fR(1)" 4
 build rootfs image
-.IP "\fBlb_binary_silo\fR(1)" 4
-installs silo into binary
 .IP "\fBlb_binary_syslinux\fR(1)" 4
 installs syslinux into binary
 .IP "\fBlb_binary_tar\fR(1)" 4
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index d3341bdfe..7b47532df 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a10-1\n"
-"POT-Creation-Date: 2013-02-15 08:59+0100\n"
+"POT-Creation-Date: 2013-02-15 12:10+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -82,7 +82,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:482 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:219
+#: en/lb_testroot.1:21 en/live-build.7:217
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -90,7 +90,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:489 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:223
+#: en/lb_testroot.1:24 en/live-build.7:221
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -98,14 +98,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:497 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:229
+#: en/lb_testroot.1:28 en/live-build.7:227
 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:498 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:230
+#: en/lb_testroot.1:29 en/live-build.7:228
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
@@ -113,7 +113,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:500 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:232
+#: en/lb_testroot.1:31 en/live-build.7:230
 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 "
@@ -123,7 +123,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:501 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:233
+#: en/lb_testroot.1:32 en/live-build.7:231
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -131,7 +131,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:503 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:235
+#: en/lb_testroot.1:34 en/live-build.7:233
 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 "
@@ -142,7 +142,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:504 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:236
+#: en/lb_testroot.1:35 en/live-build.7:234
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -150,7 +150,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:505 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:237
+#: en/lb_testroot.1:36 en/live-build.7:235
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -181,12 +181,12 @@ msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:493 en/live-build.7:225
+#: en/lb_config.1:493 en/live-build.7:223
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:495 en/live-build.7:227
+#: en/lb_config.1:495 en/live-build.7:225
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -1006,173 +1006,162 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:175
 #, no-wrap
-msgid "B<lb_binary_silo>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:177
-msgid "installs silo into binary"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:177
-#, no-wrap
 msgid "B<lb_binary_syslinux>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:179
+#: en/live-build.7:177
 msgid "installs syslinux into binary"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:179
+#: en/live-build.7:177
 #, no-wrap
 msgid "B<lb_binary_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:181
+#: en/live-build.7:179
 msgid "build harddisk binary image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:181
+#: en/live-build.7:179
 #, no-wrap
 msgid "B<lb_binary_hdd>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:183
+#: en/live-build.7:181
 msgid "build binary hdd image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:183
+#: en/live-build.7:181
 #, no-wrap
 msgid "B<lb_binary_win32-loader>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:185
+#: en/live-build.7:183
 msgid "installs win32-loader into binary"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:185
+#: en/live-build.7:183
 #, no-wrap
 msgid "B<lb_binary_yaboot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:187
+#: en/live-build.7:185
 msgid "installs yaboot into binary"
 msgstr ""
 
 #. type: SS
-#: en/live-build.7:187
+#: en/live-build.7:185
 #, no-wrap
 msgid "Source commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:188
+#: en/live-build.7:186
 #, no-wrap
 msgid "B<lb_source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:190
+#: en/live-build.7:188
 msgid "download sources"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:190
+#: en/live-build.7:188
 #, no-wrap
 msgid "B<lb_source_debian-live>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:192
+#: en/live-build.7:190
 msgid "copy debian-live config into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:190
 #, no-wrap
 msgid "B<lb_source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
+#: en/live-build.7:192
 msgid "install disk information into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:192
 #, no-wrap
 msgid "B<lb_source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
+#: en/live-build.7:194
 msgid "build iso source image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:194
 #, no-wrap
 msgid "B<lb_source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:198
+#: en/live-build.7:196
 msgid "create source checksums (md5, sha1, and/or sha256)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:198
+#: en/live-build.7:196
 #, no-wrap
 msgid "B<lb_source_net>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:200
+#: en/live-build.7:198
 msgid "build source net image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:200
+#: en/live-build.7:198
 #, no-wrap
 msgid "B<lb_source_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:202
+#: en/live-build.7:200
 msgid "build source tarball"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:202
+#: en/live-build.7:200
 #, no-wrap
 msgid "B<lb_source_hdd>(1)"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:205
+#: en/live-build.7:203
 msgid "build source hdd image"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:206
+#: en/live-build.7:204
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:207
 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 "
@@ -1184,7 +1173,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:211
+#: en/live-build.7:209
 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 "
@@ -1195,7 +1184,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:213
+#: en/live-build.7:211
 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 "
@@ -1206,7 +1195,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:215
+#: en/live-build.7:213
 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."
@@ -1219,7 +1208,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:218
+#: en/live-build.7:216
 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 "
@@ -1227,13 +1216,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:220
+#: en/live-build.7:218
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:221
+#: en/live-build.7:219
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 6cf88a70b..0f7d7354b 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: 2013-02-15 08:59+0100\n"
+"POT-Creation-Date: 2013-02-15 12:10+0100\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:482 en/lb_source.1:17
-#: en/lb_testroot.1:21 en/live-build.7:219
+#: en/lb_testroot.1:21 en/live-build.7:217
 #, 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:489 en/lb_source.1:20
-#: en/lb_testroot.1:24 en/live-build.7:223
+#: en/lb_testroot.1:24 en/live-build.7:221
 #, 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:497 en/lb_source.1:24
-#: en/lb_testroot.1:28 en/live-build.7:229
+#: en/lb_testroot.1:28 en/live-build.7:227
 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:498 en/lb_source.1:25
-#: en/lb_testroot.1:29 en/live-build.7:230
+#: en/lb_testroot.1:29 en/live-build.7:228
 #, 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:500 en/lb_source.1:27
-#: en/lb_testroot.1:31 en/live-build.7:232
+#: en/lb_testroot.1:31 en/live-build.7:230
 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:501 en/lb_source.1:28
-#: en/lb_testroot.1:32 en/live-build.7:233
+#: en/lb_testroot.1:32 en/live-build.7:231
 #, 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:503 en/lb_source.1:30
-#: en/lb_testroot.1:34 en/live-build.7:235
+#: en/lb_testroot.1:34 en/live-build.7:233
 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:504 en/lb_source.1:31
-#: en/lb_testroot.1:35 en/live-build.7:236
+#: en/lb_testroot.1:35 en/live-build.7:234
 #, 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:505 en/lb_source.1:32
-#: en/lb_testroot.1:36 en/live-build.7:237
+#: en/lb_testroot.1:36 en/live-build.7:235
 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:493 en/live-build.7:225
+#: en/lb_config.1:493 en/live-build.7:223
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:495 en/live-build.7:227
+#: en/lb_config.1:495 en/live-build.7:225
 msgid "I<live-config>(7)"
 msgstr ""
 
@@ -1007,173 +1007,162 @@ msgstr ""
 #. type: IP
 #: en/live-build.7:175
 #, no-wrap
-msgid "B<lb_binary_silo>(1)"
-msgstr ""
-
-#. type: Plain text
-#: en/live-build.7:177
-msgid "installs silo into binary"
-msgstr ""
-
-#. type: IP
-#: en/live-build.7:177
-#, no-wrap
 msgid "B<lb_binary_syslinux>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:179
+#: en/live-build.7:177
 msgid "installs syslinux into binary"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:179
+#: en/live-build.7:177
 #, no-wrap
 msgid "B<lb_binary_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:181
+#: en/live-build.7:179
 msgid "build harddisk binary image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:181
+#: en/live-build.7:179
 #, no-wrap
 msgid "B<lb_binary_hdd>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:183
+#: en/live-build.7:181
 msgid "build binary hdd image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:183
+#: en/live-build.7:181
 #, no-wrap
 msgid "B<lb_binary_win32-loader>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:185
+#: en/live-build.7:183
 msgid "installs win32-loader into binary"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:185
+#: en/live-build.7:183
 #, no-wrap
 msgid "B<lb_binary_yaboot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:187
+#: en/live-build.7:185
 msgid "installs yaboot into binary"
 msgstr ""
 
 #. type: SS
-#: en/live-build.7:187
+#: en/live-build.7:185
 #, no-wrap
 msgid "Source commands"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:188
+#: en/live-build.7:186
 #, no-wrap
 msgid "B<lb_source_debian>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:190
+#: en/live-build.7:188
 msgid "download sources"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:190
+#: en/live-build.7:188
 #, no-wrap
 msgid "B<lb_source_debian-live>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:192
+#: en/live-build.7:190
 msgid "copy debian-live config into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:192
+#: en/live-build.7:190
 #, no-wrap
 msgid "B<lb_source_disk>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:194
+#: en/live-build.7:192
 msgid "install disk information into source"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:194
+#: en/live-build.7:192
 #, no-wrap
 msgid "B<lb_source_iso>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:196
+#: en/live-build.7:194
 msgid "build iso source image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:196
+#: en/live-build.7:194
 #, no-wrap
 msgid "B<lb_source_checksums>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:198
+#: en/live-build.7:196
 msgid "create source checksums (md5, sha1, and/or sha256)"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:198
+#: en/live-build.7:196
 #, no-wrap
 msgid "B<lb_source_net>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:200
+#: en/live-build.7:198
 msgid "build source net image"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:200
+#: en/live-build.7:198
 #, no-wrap
 msgid "B<lb_source_tar>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:202
+#: en/live-build.7:200
 msgid "build source tarball"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:202
+#: en/live-build.7:200
 #, no-wrap
 msgid "B<lb_source_hdd>(1)"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:205
+#: en/live-build.7:203
 msgid "build source hdd image"
 msgstr ""
 
 #. type: SH
-#: en/live-build.7:206
+#: en/live-build.7:204
 #, no-wrap
 msgid "CONFIG FILES"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:209
+#: en/live-build.7:207
 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 "
@@ -1185,7 +1174,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:211
+#: en/live-build.7:209
 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 "
@@ -1196,7 +1185,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:213
+#: en/live-build.7:211
 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 "
@@ -1207,7 +1196,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-build.7:215
+#: en/live-build.7:213
 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."
@@ -1220,7 +1209,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-build.7:218
+#: en/live-build.7:216
 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 "
@@ -1228,13 +1217,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:220
+#: en/live-build.7:218
 #, no-wrap
 msgid "B</etc/live/build.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-build.7:221
+#: en/live-build.7:219
 #, no-wrap
 msgid "B</etc/live/build/*>"
 msgstr ""
diff --git a/scripts/build/binary b/scripts/build/binary
index 8b218c45d..2d970c426 100755
--- a/scripts/build/binary
+++ b/scripts/build/binary
@@ -66,7 +66,6 @@ lb binary_grub ${@}
 lb binary_grub2 ${@}
 lb binary_syslinux ${@}
 lb binary_yaboot ${@}
-lb binary_silo ${@}
 lb binary_disk ${@}
 lb binary_loadlin ${@}
 lb binary_win32-loader ${@}
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index fedeb9865..5df1f3d6a 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -125,11 +125,6 @@ case "${LB_BOOTLOADER}" in
 		XORRISO_EXCLUDE="boot/grub/grub_eltorito"
 		;;
 
-	silo)
-		XORRISO_OPTIONS="${XORRISO_OPTIONS} -G boot/isofs.b -B ..."
-		XORRISO_EXCLUDE="boot/isofs.b"
-		;;
-
 	syslinux)
 		case "${LB_MODE}" in
 			progress-linux)
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
deleted file mode 100755
index 33826b2ab..000000000
--- a/scripts/build/binary_silo
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 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 'installs silo into binary')"
-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_BOOTLOADER}" != "silo" ]
-then
-	exit 0
-fi
-
-# Check image type
-case "${LIVE_IMAGE_TYPE}" in
-	iso*|hdd*|tar)
-		;;
-
-	netboot)
-		# silo not required for sparc netbooting
-		exit 0
-		;;
-esac
-
-Echo_message "Begin installing silo..."
-
-# Requiring stage file
-Require_stagefile .build/config .build/bootstrap
-
-# Checking stage file
-Check_stagefile .build/binary_silo
-
-# Checking silo templates
-Check_templates silo
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architectures sparc
-
-# Checking depends
-Check_package chroot/usr/sbin/silo silo
-
-# Restoring cache
-Restore_cache cache/packages.binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Silo_live_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_LIVE})"
-
-	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  label=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  append=\"${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}\"\n"
-}
-
-Silo_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
-
-	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
-	then
-		APPEND="${APPEND} quiet"
-	fi
-
-	LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  label=${LABEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  append=\"LB_BOOTAPPEND_LIVE ${APPEND} LB_BOOTAPPEND_INSTALL\"\n"
-}
-
-# Setting destination directories
-DESTDIR_INSTALL="binary/install"
-case "${LB_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		DESTDIR_LIVE="binary/casper"
-		;;
-
-	live-boot)
-		INITFS="live"
-		DESTDIR_LIVE="binary/live"
-		;;
-
-	*)
-		INITFS=""
-		DESTDIR_LIVE="binary/boot"
-		;;
-esac
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
-fi
-
-if [ -n "${LB_NET_COW_PATH}" ]
-then
-	Echo_error "Net cow not supported on silo"
-	exit 1
-fi
-
-if [ "${LB_EXPOSED_ROOT}" != "false" ]
-then
-	LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-
-Silo_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-
-if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ]
-then
-	Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${LB_BOOTAPPEND_FAILSAFE}"
-fi
-
-if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz-*
-	do
-		KERNEL_IMAGE="$(basename ${KERNEL})"
-		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinuz-||')"
-		INITRD="initrd.img-${KERNEL_VERSION}"
-
-		Silo_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
-		Silo_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${LB_BOOTAPPEND_FAILSAFE}"
-	done
-fi
-
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling debian-installer configuration
-if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
-then
-	VMLINUZ_DI="vmlinuz"
-	INITRD_DI="initrd.gz"
-	APPEND_DI="vga=normal"
-
-	Silo_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Silo_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Silo_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
-	Silo_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
-	Silo_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
-fi
-
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-case "${LIVE_IMAGE_TYPE}" in
-	iso*|hdd*)
-		# Copying silo
-		mkdir -p binary/boot
-
-		case "${LB_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/boot/second.b binary/boot
-				;;
-
-			false)
-				cp /boot/second.b binary/boot
-				;;
-		esac
-
-		cp -r "${TEMPLATES}"/* binary/boot
-
-		if [ "${LB_DEBIAN_INSTALLER}" = "false" ]
-		then
-			rm -f binary/boot/debian.txt.install
-		else
-			mv binary/boot/debian.txt.install binary/boot/debian.txt
-		fi
-
-		# Configure silo templates
-		sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" \
-		       -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
-		       binary/boot/silo.conf
-		sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \
-		       -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \
-		       binary/boot/silo.conf
-		sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" \
-		       -e "s|LB_VERSION|${VERSION}|" \
-		       -e "s|LB_DISTRIBUTION|${LB_DISTRIBUTION}|" \
-		       binary/boot/debian.txt
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages.binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .build/binary_silo
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 5d7a984d8..44c610f7e 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -89,15 +89,6 @@ EOF
 	powerpc)
 		echo "yaboot" >> source-selection.txt
 		;;
-
-	sparc)
-
-cat >> source-selection.txt << EOF
-silo
-sparc-utils
-EOF
-
-		;;
 esac
 
 if [ -n "${LB_TASKS}" ]
diff --git a/templates/silo/debian.txt b/templates/silo/debian.txt
deleted file mode 100644
index 459adf582..000000000
--- a/templates/silo/debian.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-                       Welcome to Debian GNU/Linux!
-
-This is a Debian LB_DISTRIBUTION live image.
-It was built on LB_DATE by live-build LB_VERSION.
-
-You must have at least 64 megabytes of RAM to run this Debian Live system.
-
-See the Live Manual or the FAQ for more information; both documents are
-available at the Debian Live web site, http://live.debian.net/
-
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
-by applicable law.
-
-  [ Press ENTER to boot the live system ]
-
-Or:
-
-  "live-failsafe"
-     Start the live system in fail-safe mode.
-
diff --git a/templates/silo/debian.txt.install b/templates/silo/debian.txt.install
deleted file mode 100644
index a8d1bb6e8..000000000
--- a/templates/silo/debian.txt.install
+++ /dev/null
@@ -1,37 +0,0 @@
-
-                       Welcome to Debian GNU/Linux!
-
-This is a Debian LB_DISTRIBUTION combined live and installation image.
-It was built on LB_DATE by live-build LB_VERSION.
-
-You must have at least 64 megabytes of RAM to run this Debian Live system.
-
-See the Live Manual or the FAQ for more information; both documents are
-available at the Debian Live web site, http://live.debian.net/
-
-You must have at least 32 megabytes of RAM to use the Debian installer.
-
-You should have space on your hard disk to create a new disk partition
-of at least 256 megabytes to install the base system. You'll need more
-disk space to install additional packages, depending on what you wish
-to do with your new Debian system.
-
-See the Installation Manual or the FAQ for more information; both
-documents are available at the Debian web site, http://www.debian.org/
-
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
-by applicable law.
-
-  [ Press ENTER to boot the live system ]
-
-Or:
-
-  "live-failsafe"
-     Start the live system in fail-safe mode.
-  "install"
-     Start the installation using the normal installer.
-  "expert"
-     Boot into expert install mode, for maximum control.
-  "rescue"
-     Boot into the installer rescue mode.
-
diff --git a/templates/silo/silo.conf b/templates/silo/silo.conf
deleted file mode 100644
index d473bf270..000000000
--- a/templates/silo/silo.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-partition=1
-timeout=600
-message=/boot/debian.txt
-default=live
-read-write
-
-LINUX_LIVE
-
-LINUX_INSTALL