Merged

diff --combined debian/changelog
index f6eff5c,e84bee2..1f30d4c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,46 +1,55 @@@
 +grml-live (0.0.11) unstable; urgency=low
 +
 +  * Add new class XORG.
 +  * Add X.org packages to GRML_MEDIUM.
 +  * Make sure /etc/X11/X is not a symlink to /bin/true. Check and fix
 +    via /etc/grml/fai/config/scripts/GRMLBASE/32-xorg.
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 26 Nov 2007 15:07:54 +0100
 +
  grml-live (0.0.10) unstable; urgency=low
  
+   * Drop patches which are part of FAI 3.2.3 now. Depend on
+     FAI version 3.2.3 therefor.
+   * FAI 3.2.3 has a new log schema, adjusted grml-live accordingly.
+     Quoting the NEWS file of FAI:
+     - LOGDIR is now /var/log/fai/$HOSTNAME/$FAI_ACTION_date+time
+     - LOGDIR is /tmp/fai during an installation (not dirinstall), and
+       will be copied to the path above at the end of an installation
+   * Log the executed FAI, squashfs and mkisofs command lines to
+     /var/log/grml-live.log.
+   * New option '-C <configuration_file>' for specifying a configuration
+     file. Needs heavy testing though, because the files are updated
+     during runtime it isn't as easy as expected to be. :-/
+   * Support $ZERO_FAI_LOGFILE inside grml-live configuration for removing
+     old FAI logs.
    * Do not enable apt-listbugs if the binary is not available.
      [Testing: issue340]
-   * Add keychain package to GRML_MEDIUM.
    * Add keychain package to GRML_SMALL.
+   * Add new packages to GRML_MEDIUM:
+     - grml-live
+     - keychain
+     - lzma-modules-2.6.23-grml
+     - squashfs-modules-2.6.23-grml (we build the module external now)
+   * Add new packages to GRML_FULL:
+     - aosd-cat
+     - grml-live
+     - lzma-modules-2.6.23-grml
+     - squashfs-modules-2.6.23-grml (we build the module external now)
+   * Support loading of squashfs module via
+     /etc/grml/fai/live-initramfs/grml-script.init-top
+   * Make sure we have pinning for grml-stable and grml-testing
+     repositories via /etc/grml/fai/apt/preferences, not matter where
+     the packages come from (web vs. local mirror/cache for example).
+   * Remove base.tgz from chroot directory.
    * Do not create /etc/sysconfig/network-scripts and
      /etc/sysconfig/provider any longer in cleanup script.
    * Fix typo in bootsplash f3 (thanks, jimmy).
    * Switch order of 'lang=us apm=power-off' to 'apm=poweroff' in
      isolinyx/syslinux/grub configuration because getbootparam
      of grml-autoconfig requires a whitespace inside /proc/cmdline.
+   * Support grml2ram bootoption inside isolinyx/syslinux/grub
+     configuration.
  
   -- Michael Prokop <mika@grml.org>  Mon, 19 Nov 2007 12:49:37 +0100
  

diff --combined etc/grml/fai/config/package_config/GRML_MEDIUM
index cf95af3,ec0ba46..8fc659d
--- 1/etc/grml/fai/config/package_config/GRML_MEDIUM
--- 2/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@@ -39,7 -39,6 +39,7 @@@ deborpha
  dhcp3-client
  dialog
  diff
 +dillo
  dmidecode
  dmraid
  dmsetup
@@@ -51,13 -50,11 +51,13 @@@ e2fsprog
  e3
  ed
  eject
 +eterm
  ethtool
  file
  file-rc
  findutils
  firmware-ipw3945
 +fluxbox
  fnord
  fuse-utils
  gawk
@@@ -69,11 -66,11 +69,12 @@@ grml2us
  grml-autoconfig
  grml-debian-keyring
  grml-debootstrap
 +grml-desktop
  grml-docs
  grml-etc
  grml-etc-core
  grml-hwinfo
+ grml-live
  grml-network
  grml-policyrcd
  grml-rebuildfstab
@@@ -84,7 -81,6 +85,7 @@@ grml-shli
  grml-small
  grml-tips
  grml-usleep
 +grml-x
  grub
  guessnet
  gzip
@@@ -191,84 -187,20 +192,83 @@@ unzo
  update-inetd
  usbutils
  util-linux
 +vim
  vlan
  vlock
 -vim
  wget
  whiptail
  wipe
  wireless-tools
  wpasupplicant
 +xcursor-themes
 +xfonts-100dpi
 +xfonts-75dpi
 +xfonts-base
  xfsprogs
 +xosd-bin
 +xserver-xorg
 +xserver-xorg-core
 +xserver-xorg-input-aiptek
 +xserver-xorg-input-all
 +xserver-xorg-input-elo2300
 +xserver-xorg-input-elographics
 +xserver-xorg-input-evdev
 +xserver-xorg-input-evtouch
 +xserver-xorg-input-hyperpen
 +xserver-xorg-input-joystick
 +xserver-xorg-input-kbd
 +xserver-xorg-input-mouse
 +xserver-xorg-input-penmount
 +xserver-xorg-input-synaptics
 +xserver-xorg-input-vmmouse
 +xserver-xorg-input-void
 +xserver-xorg-input-wacom
 +xserver-xorg-video-all
 +xserver-xorg-video-amd
 +xserver-xorg-video-apm
 +xserver-xorg-video-ark
 +xserver-xorg-video-ati
 +xserver-xorg-video-chips
 +xserver-xorg-video-cirrus
 +xserver-xorg-video-cyrix
 +xserver-xorg-video-dummy
 +xserver-xorg-video-fbdev
 +xserver-xorg-video-glint
 +xserver-xorg-video-i128
 +xserver-xorg-video-i740
 +xserver-xorg-video-i810
 +xserver-xorg-video-imstt
 +xserver-xorg-video-intel
 +xserver-xorg-video-ivtv
 +xserver-xorg-video-mga
 +xserver-xorg-video-neomagic
 +xserver-xorg-video-newport
 +xserver-xorg-video-nsc
 +xserver-xorg-video-nv
 +xserver-xorg-video-rendition
 +xserver-xorg-video-s3
 +xserver-xorg-video-s3virge
 +xserver-xorg-video-savage
 +xserver-xorg-video-siliconmotion
 +xserver-xorg-video-sis
 +xserver-xorg-video-sisusb
 +xserver-xorg-video-tdfx
 +xserver-xorg-video-tga
 +xserver-xorg-video-trident
 +xserver-xorg-video-tseng
 +xserver-xorg-video-v4l
 +xserver-xorg-video-vesa
 +xserver-xorg-video-vga
 +xserver-xorg-video-via
 +xserver-xorg-video-vmware
 +xserver-xorg-video-voodoo
 +xterm
  zip
  zsh
  
  PACKAGES aptitude I386 
- linux-image-2.6.23-grml aufs-modules-2.6.23-grml grml-kerneladdons-2.6.23
- # linux-image-2.6.22-grml aufs-modules-2.6.22-grml grml-kerneladdons-2.6.22
+ linux-image-2.6.23-grml squashfs-modules-2.6.23-grml lzma-modules-2.6.23-grml aufs-modules-2.6.23-grml grml-kerneladdons-2.6.23
  
  PACKAGES aptitude AMD64
  linux-image-2.6.23-grml64 aufs-modules-2.6.23-grml64
 +PACKAGES aptitude