Remove the data/bootdisk directory tree.

This is all handled by lorax now, and having it in two places is confusing.

26 files changed, 2 insertions, 662 deletions

diff --git a/configure.ac b/configure.ac
index a39a168c1..a31d48041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,12 +250,6 @@ AC_CONFIG_SUBDIRS([widgets])
 
 AC_CONFIG_FILES([Makefile
                  data/Makefile
-                 data/bootdisk/Makefile
-                 data/bootdisk/i386/Makefile
-                 data/bootdisk/ppc/Makefile
-                 data/bootdisk/sparc/Makefile
-                 data/bootdisk/s390x/Makefile
-                 data/bootdisk/x86_64/Makefile
                  data/command-stubs/Makefile
                  docs/Makefile
                  dracut/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 18e165f47..deca2e4d5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,7 +17,7 @@
 #
 # Author: Martin Sivak <msivak@redhat.com>
 
-SUBDIRS = bootdisk command-stubs icons liveinst pixmaps systemd post-scripts
+SUBDIRS = command-stubs icons liveinst pixmaps systemd post-scripts
 
 EXTRA_DIST = lang-table
 CLEANFILES = *~ lang-names 
diff --git a/data/bootdisk/Makefile.am b/data/bootdisk/Makefile.am
deleted file mode 100644
index e6ba4bdad..000000000
--- a/data/bootdisk/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# bootdisk/Makefile.am for anaconda
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-SUBDIRS = i386 ppc sparc s390x x86_64
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/bootdisk/i386/Makefile.am b/data/bootdisk/i386/Makefile.am
deleted file mode 100644
index 030b8d5e8..000000000
--- a/data/bootdisk/i386/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# bootdisk/i386/Makefile.am for anaconda
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_I386
-bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
-dist_boot_DATA = boot.msg grub.conf syslinux.cfg
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/bootdisk/i386/boot.msg b/data/bootdisk/i386/boot.msg
deleted file mode 100644
index ff54899e1..000000000
--- a/data/bootdisk/i386/boot.msg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-splash.lss
-
- -  Press the 01<ENTER>07 key to begin the installation process.
-
diff --git a/data/bootdisk/i386/grub.conf b/data/bootdisk/i386/grub.conf
deleted file mode 100644
index 6e94d0506..000000000
--- a/data/bootdisk/i386/grub.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#debug --graphics
-default=0
-splashimage=@SPLASHPATH@
-timeout 5
-hiddenmenu
-title @PRODUCT@ @VERSION@
-	kernel @KERNELPATH@
-	initrd @INITRDPATH@
diff --git a/data/bootdisk/i386/syslinux.cfg b/data/bootdisk/i386/syslinux.cfg
deleted file mode 100644
index 54214849c..000000000
--- a/data/bootdisk/i386/syslinux.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-default linux
-prompt 1
-timeout 600
-
-display boot.msg
-
-menu background splash.jpg
-menu title Welcome to @PRODUCT@ @VERSION@!
-menu color border 0 #ffffffff #00000000
-menu color sel 7 #ffffffff #ff000000
-menu color title 0 #ffffffff #00000000
-menu color tabmsg 0 #ffffffff #00000000
-menu color unsel 0 #ffffffff #00000000
-menu color hotsel 0 #ff000000 #ffffffff
-menu color hotkey 7 #ffffffff #ff000000
-menu color scrollbar 0 #ffffffff #00000000
-
-label linux
-  menu label ^Install a new system or upgrade an existing system
-  menu default
-  kernel vmlinuz
-  append initrd=initrd.img quiet
-label vesa
-  menu label Install system with ^basic video driver
-  kernel vmlinuz
-  append initrd=initrd.img xdriver=vesa nomodeset quiet
-label rescue
-  menu label ^Rescue installed system
-  kernel vmlinuz
-  append initrd=initrd.img rescue quiet
-label local
-  menu label Boot from ^local drive
-  localboot 0xffff
diff --git a/data/bootdisk/ppc/Makefile.am b/data/bootdisk/ppc/Makefile.am
deleted file mode 100644
index 4f6e298a4..000000000
--- a/data/bootdisk/ppc/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-# bootdisk/ppc/Makefile.am for anaconda
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_PPC
-bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
-dist_boot_DATA = magic ofboot.b yaboot.conf.in bootinfo.txt mapping \
-                 yaboot.conf.3264
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/bootdisk/ppc/bootinfo.txt b/data/bootdisk/ppc/bootinfo.txt
deleted file mode 100644
index ac766d4d2..000000000
--- a/data/bootdisk/ppc/bootinfo.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-<chrp-boot> <description>Linux</description> 
-<os-name>Linux</os-name> 
-<boot-script>boot &device;:\ppc\chrp\yaboot</boot-script> 
-<icon size=64,64 color-space=3,3,2> 
-<bitmap> FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
-FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 </bitmap> </icon> </chrp-boot>
diff --git a/data/bootdisk/ppc/magic b/data/bootdisk/ppc/magic
deleted file mode 100644
index 387727c4e..000000000
--- a/data/bootdisk/ppc/magic
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# Example magic file for mkhybrid
-#
-# The "message" for the offset MUST be 4 characters for the CREATOR
-# and 4 characters for the TYPE - white space is optional between them.
-# Any other characters on this line are ignored. Continuation lines (starting
-# with '>') are also ignored i.e. only the initial offset lines are used.
-#
-# The continuation lines are given here, but they do not need to exist.
-
-#
-# James Pearson 20/5/98
-
-# off	type		test		message
-
-# GIF
-0	string		GIF8		8BIM GIFf
->4	string		7a		\b, version 8%s,
->4	string		9a		\b, version 8%s,
->6	leshort		>0		%hd x
->8	leshort		>0		%hd,
-#>10	byte		&0x80		color mapped,
-#>10	byte&0x07	=0x00		2 colors
-#>10	byte&0x07	=0x01		4 colors
-#>10	byte&0x07	=0x02		8 colors
-#>10	byte&0x07	=0x03		16 colors
-#>10	byte&0x07	=0x04		32 colors
-#>10	byte&0x07	=0x05		64 colors
-#>10	byte&0x07	=0x06		128 colors
-#>10	byte&0x07	=0x07		256 colors
-
-# JPEG images
-#
-0	ubeshort		0xffd8		8BIM JPEG  image data
-
-# StuffIt
-#
-0	string		SIT!		SIT!SIT!
-
-# standard unix compress
-0	string		\037\235	LZIV ZIVU
->2	byte&0x80	>0		block compressed
->2	byte&0x1f	x		%d bits
-
-# gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver)
-0       string          \037\213        GNUz ZIVU gzip compressed data
->2      byte            <8              \b, reserved method,
->2      byte            8               \b, deflated,
->3	byte		&0x01		ASCII,
->3	byte		&0x02		continuation,
->3	byte		&0x04		extra field,
->3	byte		&0x08		original filename,
->3	byte		&0x10		comment,
->3	byte		&0x20		encrypted,
->4	ledate		x		last modified: %s,
->8	byte		2		max compression,
->8	byte		4		max speed,
->9	byte		=0x00		os: MS-DOS
->9	byte		=0x01		os: Amiga
->9	byte		=0x02		os: VMS
->9	byte		=0x03		os: Unix
->9	byte		=0x05		os: Atari
->9	byte		=0x06		os: OS/2
->9	byte		=0x07		os: MacOS
->9	byte		=0x0A		os: Tops/20
->9	byte		=0x0B		os: Win/32
-
-# Postscript
-0	string		%!		ASPSTEXT
->2	string		PS-Adobe-	conforming
->>11	string		>\0		at level %.3s
->>>15	string		EPS		- type %s
->>>15	string		Query		- type %s
->>>15	string		ExitServer	- type %s
-# Some PCs have the annoying habit of adding a ^D as a document separator
-0	string		\004%!		ASPS TEXT PostScript document text
->3	string		PS-Adobe-	conforming
->>12	string		>\0		at level %.3s
->>>16	string		EPS		- type %s
->>>16	string		Query		- type %s
->>>16	string		ExitServer	- type %s
diff --git a/data/bootdisk/ppc/mapping b/data/bootdisk/ppc/mapping
deleted file mode 100644
index cf83076d4..000000000
--- a/data/bootdisk/ppc/mapping
+++ /dev/null
@@ -1,27 +0,0 @@
-# Example filename mapping file
-#
-# yaboot		Raw	'UNIX'	'boot'	"Bootstrap"
-# vmlinux		Raw	'UNIX'	'boot'	"Bootstrap"
-#
-# EXTN          XLate   CREATOR   TYPE     Comment
-COPYING         Ascii   'ttxt'  'ttro'  "Text File"
-CREDITS         Ascii   'ttxt'  'ttro'  "Text File"
-README          Ascii   'ttxt'  'ttro'  "Text File"
-RPM-GPG-KEY     Ascii   'ttxt'  'ttro'  "Text File"
-RELEASE_NOTES   Ascii   'ttxt'  'ttro'  "Text File"
-.b              Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file"
-.gif            Raw     '8BIM'  'GIFf'  "Gif File"
-.jpg            Raw     '8BIM'  'JPEG'  "Jpeg File"
-.tif            Raw     '8BIM'  'TIFF'  "Photoshop TIFF image"
-.hqx            Ascii   'BnHq'  'TEXT'  "BinHex file"
-.doc            Raw     'MSWD'  'WDBN'  "Word file"
-.mov            Raw     'TVOD'  'MooV'  "QuickTime Movie"
-.html           Ascii   'MOSS'  'TEXT'  "HTML File"
-.htm            Ascii   'MOSS'  'TEXT'  "HTML File"
-.conf           Ascii   'ttxt'  'TEXT'  "config file"
-.txt            Ascii   'ttxt'  'TEXT'  "Text File"
-.tbxi           Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file"
-.sea            Raw     'aust'  'APPL'  "Self Expanding Archive"
-.sit            Raw     'SIT!'  'SITD'  "Stuffit Expander file"
-*               Raw     '????'  '????'  "Unknown"
-
diff --git a/data/bootdisk/ppc/ofboot.b b/data/bootdisk/ppc/ofboot.b
deleted file mode 100644
index c811894e7..000000000
--- a/data/bootdisk/ppc/ofboot.b
+++ /dev/null
@@ -1,74 +0,0 @@
-<CHRP-BOOT>
-<COMPATIBLE>
-MacRISC MacRISC3 MacRISC4
-</COMPATIBLE>
-
-<DESCRIPTION>
-Boot Chooser
-</DESCRIPTION>
-
-<BOOT-SCRIPT>
-" screen" output
-load-base release-load-area
-" /cpus/@0" find-package if
- " 64-bit" rot get-package-property 0= if
-  2drop
-  " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc64\yaboot.conf" eval
- else
-  " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc32\yaboot.conf" eval
- then
-then
-</BOOT-SCRIPT>
-
-<OS-BADGE-ICONS>
-1010
-000000000000F8FEACF6000000000000
-0000000000F5FFFFFEFEF50000000000
-00000000002BFAFEFAFCF70000000000
-0000000000F65D5857812B0000000000
-0000000000F5350B2F88560000000000
-0000000000F6335708F8FE0000000000
-00000000005600F600F5FD8100000000
-00000000F9F8000000F5FAFFF8000000
-000000008100F5F50000F6FEFE000000
-000000F8F700F500F50000FCFFF70000
-00000088F70000F50000F5FCFF2B0000
-0000002F582A00F5000008ADE02C0000
-00090B0A35A62B0000002D3B350A0000
-000A0A0B0B3BF60000505E0B0A0B0A00
-002E350B0B2F87FAFCF45F0B2E090000
-00000007335FF82BF72B575907000000
-000000000000ACFFFF81000000000000
-000000000081FFFFFFFF810000000000
-0000000000FBFFFFFFFFAC0000000000
-000000000081DFDFDFFFFB0000000000
-000000000081DD5F83FFFD0000000000
-000000000081DDDF5EACFF0000000000
-0000000000FDF981F981FFFF00000000
-00000000FFACF9F9F981FFFFAC000000
-00000000FFF98181F9F981FFFF000000
-000000ACACF981F981F9F9FFFFAC0000
-000000FFACF9F981F9F981FFFFFB0000
-00000083DFFBF981F9F95EFFFFFC0000
-005F5F5FDDFFFBF9F9F983DDDD5F0000
-005F5F5F5FDD81F9F9E7DF5F5F5F5F00
-0083DD5F5F83FFFFFFFFDF5F835F0000
-000000FBDDDFACFBACFBDFDFFB000000
-000000000000FFFFFFFF000000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFF0000000000
-0000000000FFFFFFFFFFFFFF00000000
-00000000FFFFFFFFFFFFFFFFFF000000
-00000000FFFFFFFFFFFFFFFFFF000000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00
-00FFFFFFFFFFFFFFFFFFFFFFFFFF0000
-000000FFFFFFFFFFFFFFFFFFFF000000
-</OS-BADGE-ICONS>
-</CHRP-BOOT>
diff --git a/data/bootdisk/ppc/yaboot.conf.3264 b/data/bootdisk/ppc/yaboot.conf.3264
deleted file mode 100644
index 8b5af08b1..000000000
--- a/data/bootdisk/ppc/yaboot.conf.3264
+++ /dev/null
@@ -1,14 +0,0 @@
-init-message = "\nWelcome to the %PRODUCT% %VERSION% installer!\nUse 'linux32' for 32-bit kernel.\n\n"
-timeout=6000
-default=linux
-
-image=/ppc/ppc64/vmlinuz
-	label=linux64
-	alias=linux
-	initrd=/ppc/ppc64/ramdisk.image.gz
-	read-only
-
-image=/ppc/ppc32/vmlinuz
-	label=linux32
-	initrd=/ppc/ppc32/ramdisk.image.gz
-	read-only
diff --git a/data/bootdisk/ppc/yaboot.conf.in b/data/bootdisk/ppc/yaboot.conf.in
deleted file mode 100644
index d06768a5d..000000000
--- a/data/bootdisk/ppc/yaboot.conf.in
+++ /dev/null
@@ -1,8 +0,0 @@
-init-message = "\nWelcome to the %BITS%-bit %PRODUCT% %VERSION% installer!\nHit <TAB> for boot options.\n\n"
-timeout=6000
-default=linux
-
-image=/ppc/ppc%BITS%/vmlinuz
-	label=linux
-	initrd=/ppc/ppc%BITS%/ramdisk.image.gz
-	read-only
diff --git a/data/bootdisk/s390x/Makefile.am b/data/bootdisk/s390x/Makefile.am
deleted file mode 100644
index c75ccbe02..000000000
--- a/data/bootdisk/s390x/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# bootdisk/s390x/Makefile.am for anaconda
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_S390
-bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
-dist_boot_DATA = generic.ins generic.prm redhat.exec
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/bootdisk/s390x/generic.ins b/data/bootdisk/s390x/generic.ins
deleted file mode 100644
index a690f2e04..000000000
--- a/data/bootdisk/s390x/generic.ins
+++ /dev/null
@@ -1,5 +0,0 @@
-* minimal lpar ins file
-images/kernel.img 0x00000000
-images/initrd.img @INITRD_LOAD_ADDRESS@
-images/generic.prm 0x00010480
-images/initrd.addrsize 0x00010408
diff --git a/data/bootdisk/s390x/generic.prm b/data/bootdisk/s390x/generic.prm
deleted file mode 100644
index e953ce2ff..000000000
--- a/data/bootdisk/s390x/generic.prm
+++ /dev/null
@@ -1 +0,0 @@
-root=/dev/ram0 ro ip=off ramdisk_size=40000 cio_ignore=all,!0.0.0009
diff --git a/data/bootdisk/s390x/redhat.exec b/data/bootdisk/s390x/redhat.exec
deleted file mode 100644
index f1e5931a3..000000000
--- a/data/bootdisk/s390x/redhat.exec
+++ /dev/null
@@ -1,9 +0,0 @@
-/* */
-'CL RDR'
-'PURGE RDR ALL'
-'SPOOL PUNCH * RDR'
-'PUNCH KERNEL IMG A (NOH'
-'PUNCH GENERIC PRM A (NOH'
-'PUNCH INITRD IMG A (NOH'
-'CH RDR ALL KEEP NOHOLD'
-'I 00C'
diff --git a/data/bootdisk/sparc/Makefile.am b/data/bootdisk/sparc/Makefile.am
deleted file mode 100644
index 4d2c3f29b..000000000
--- a/data/bootdisk/sparc/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# bootdisk/sparc/Makefile.am for anaconda
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Dennis Gilmore <dgilmore@redhat.com>
-
-if IS_SPARC
-bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
-dist_boot_DATA = boot.msg silo.conf
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/bootdisk/sparc/boot.msg b/data/bootdisk/sparc/boot.msg
deleted file mode 100644
index b28310e31..000000000
--- a/data/bootdisk/sparc/boot.msg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-                   Welcome to Fedora SPARC Linux!
-
- -  To install or upgrade in graphical mode, press the <ENTER> key.
-
- -  To install or upgrade in text mode, type: linux text <ENTER>.
-
- -  To enter rescue mode] type: linux resuce <ENTER>.
-
diff --git a/data/bootdisk/sparc/silo.conf b/data/bootdisk/sparc/silo.conf
deleted file mode 100644
index 285546f07..000000000
--- a/data/bootdisk/sparc/silo.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-partition=1
-default=linux
-read-write
-timeout=100
-message=/boot/boot.msg
-image[sun4u]=/boot/vmlinuz
-        label=linux
-        alias=install
-        initrd=/boot/initrd.img
-image[sun4u]=/boot/vmlinuz
-        label=text
-        append=text
-        initrd=/boot/initrd.img
-image[sun4u]=/boot/vmlinuz
-        label=ks
-        append=ks
-        initrd=/boot/initrd.img
diff --git a/data/bootdisk/x86_64/Makefile.am b/data/bootdisk/x86_64/Makefile.am
deleted file mode 100644
index a4012c55d..000000000
--- a/data/bootdisk/x86_64/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-# bootdisk/x86_64/Makefile.am for anaconda
-#
-# Copyright (C) 2009  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: David Cantrell <dcantrell@redhat.com>
-
-if IS_X86_64
-bootdir        = $(datadir)/$(PACKAGE_NAME)/boot
-dist_boot_DATA = boot.msg grub.conf syslinux.cfg
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/bootdisk/x86_64/boot.msg b/data/bootdisk/x86_64/boot.msg
deleted file mode 100644
index ff54899e1..000000000
--- a/data/bootdisk/x86_64/boot.msg
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-splash.lss
-
- -  Press the 01<ENTER>07 key to begin the installation process.
-
diff --git a/data/bootdisk/x86_64/grub.conf b/data/bootdisk/x86_64/grub.conf
deleted file mode 100644
index 6e94d0506..000000000
--- a/data/bootdisk/x86_64/grub.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-#debug --graphics
-default=0
-splashimage=@SPLASHPATH@
-timeout 5
-hiddenmenu
-title @PRODUCT@ @VERSION@
-	kernel @KERNELPATH@
-	initrd @INITRDPATH@
diff --git a/data/bootdisk/x86_64/syslinux.cfg b/data/bootdisk/x86_64/syslinux.cfg
deleted file mode 100644
index 54214849c..000000000
--- a/data/bootdisk/x86_64/syslinux.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-default linux
-prompt 1
-timeout 600
-
-display boot.msg
-
-menu background splash.jpg
-menu title Welcome to @PRODUCT@ @VERSION@!
-menu color border 0 #ffffffff #00000000
-menu color sel 7 #ffffffff #ff000000
-menu color title 0 #ffffffff #00000000
-menu color tabmsg 0 #ffffffff #00000000
-menu color unsel 0 #ffffffff #00000000
-menu color hotsel 0 #ff000000 #ffffffff
-menu color hotkey 7 #ffffffff #ff000000
-menu color scrollbar 0 #ffffffff #00000000
-
-label linux
-  menu label ^Install a new system or upgrade an existing system
-  menu default
-  kernel vmlinuz
-  append initrd=initrd.img quiet
-label vesa
-  menu label Install system with ^basic video driver
-  kernel vmlinuz
-  append initrd=initrd.img xdriver=vesa nomodeset quiet
-label rescue
-  menu label ^Rescue installed system
-  kernel vmlinuz
-  append initrd=initrd.img rescue quiet
-label local
-  menu label Boot from ^local drive
-  localboot 0xffff
diff --git a/scripts/makeupdates b/scripts/makeupdates
index 8145fb18b..0d5cceab5 100755
--- a/scripts/makeupdates
+++ b/scripts/makeupdates
@@ -166,7 +166,7 @@ def copyUpdatedFiles(tag, updates, cwd):
             fields = file.split('/')
             subdir = fields[0]
             if subdir in ['po', 'scripts','command-stubs', 'tests',
-                          'bootdisk', 'docs', 'fonts', 'utils',
+                          'docs', 'fonts', 'utils',
                           'liveinst', 'dracut', 'data']:
                 continue
             else: