- Tweaked exclude-udebs-i386, removing fat-modules as it's not available

otherwise if booting from floppy, and removing excludes of partconf,
      partitioner, and discover2-data-udeb, which are not in unstable for i386
      any longer.
    - Updated exclude-udebs to match the current CD initrd package list.

data/sarge/exclude-udebs

@@ -12,23 +12,27 @@ anna
 di-utils-shell
 di-utils-reboot
 lowmemcheck
-# build/pkg-lists/cdrom/common, in d-i cvs
+# build/pkg-lists/cdrom/common, in d-i cvs (also included in the
+# root+cd-drivers floppies)
 busybox-cvs-udeb
 rootskel-locale
 languagechooser
 countrychooser
+iso-3166-udeb
 hw-detect
 cdrom-detect
 cdrom-retriever
-load-installer
+load-cdrom
 cdrom-checker
 bogl-bterm-udeb
 di-utils-terminfo
 cdebconf-priority
 cdebconf-newt-udeb
 usb-discover
+file-preseed
 nano-udeb
 floppy-retriever
+libfribidi0-udeb
 # Already on the initrd, thanks to library reduction.
 libdebconfclient0-udeb
 # A reduced version is on the initrd. Nothing currently needs the full
@@ -61,10 +65,9 @@ dhcp3-client-udeb
 pump-udeb
 # This package is only useful in the d-i-demo.
 di-utils-exit-installer
-# These loader udebs are not currently used on this CDs. That may change,
-# but for now load-installer is used.
+# No need for these loaders.
+load-installer
 download-installer
-load-cdrom
 load-floppy
 # Only useful in the hd-media initrd.
 iso-scan

data/sarge/exclude-udebs-i386

@@ -1,15 +1,15 @@
-# These udebs are in the d-i cdrom initrd and the hd-media initrd. 
+# These udebs are in the d-i cdrom initrd and the cd-drivers+root floppies. 
 # As such, there is no reason to keep another copy of them on the CD
 # in udeb form.
 isa-pnp-modules-*
 socket-modules-*
 console-keymaps-at
 console-keymaps-usb
+floppy-modules-*
 discover-data-udeb
 discover-udeb
 discover1-data-udeb
 discover1-udeb
-fat-modules-*
 cdrom-core-modules-*
 cdrom-modules-*
 ide-modules-*
@@ -25,11 +25,3 @@ userdevfs
 # The speakup kernel modules are not useful unless the access images are
 # provided.
 *-speakup-di
-# These packages are for the old partitioning system, and should not be
-# included as they confuse users.
-# Note that partconf-find-partitions is used by lvmcfg-utils, so is not
-# excluded likewise, partconf-mkfstab is used by autopartkit.
-partconf
-partitioner
-# This is obsolete.
-discover2-data-udeb