[SCM] debian-live/config-webc branch, master, updated. 7394fe402a9f01bf5e89e4e8bd0f7b50b26fa4d0

Daniel Baumann daniel at debian.org
Mon Sep 17 11:03:46 UTC 2007


The branch, master has been updated
       via  7394fe402a9f01bf5e89e4e8bd0f7b50b26fa4d0 (commit)
      from  75fd03eb4233824e07f45eb976c0f4280ab06aaa (commit)


- Shortlog ------------------------------------------------------------
7394fe4 Updating.

Summary of changes:
 webconverger/config/binary                         |  105 +++++++++++++-----
 .../apt-cdrom-setup_0.26~backports40+1_all.udeb    |  Bin 0 -> 7880 bytes
 .../apt-mirror-setup_0.26~backports40+1_all.udeb   |  Bin 0 -> 60374 bytes
 .../apt-setup-udeb_0.26~backports40+1_all.udeb     |  Bin 0 -> 19582 bytes
 .../apt-setup_0.26~backports40+1.dsc               |   22 ++++
 .../apt-setup_0.26~backports40+1.tar.gz            |  Bin 0 -> 135312 bytes
 .../base-installer_1.84~backports40+1.dsc          |   22 ++++
 .../base-installer_1.84~backports40+1.tar.gz       |  Bin 0 -> 204011 bytes
 .../base-installer_1.84~backports40+1_all.udeb     |  Bin 0 -> 37458 bytes
 .../bootstrap-base_1.84~backports40+1_i386.udeb    |  Bin 0 -> 122658 bytes
 .../elilo-installer_1.12~backports40+1.dsc         |   23 ++++
 .../elilo-installer_1.12~backports40+1.tar.gz      |  Bin 0 -> 47698 bytes
 .../elilo-installer_1.12~backports40+1_i386.udeb   |  Bin 0 -> 29862 bytes
 .../finish-install_2.13~backports40+1.dsc          |   22 ++++
 .../finish-install_2.13~backports40+1.tar.gz       |  Bin 0 -> 43954 bytes
 .../finish-install_2.13~backports40+1_all.udeb     |  Bin 0 -> 19030 bytes
 ...inux-modules-di-i386-2.6_1.06~backports40+1.dsc |   22 ++++
 ...x-modules-di-i386-2.6_1.06~backports40+1.tar.gz |  Bin 0 -> 1887 bytes
 ...inux-modules-di-i386-2.6_1.06~backports40+2.dsc |   22 ++++
 ...x-modules-di-i386-2.6_1.06~backports40+2.tar.gz |  Bin 0 -> 1888 bytes
 .../live-installer_2~local40+1.dsc                 |   22 ++++
 .../live-installer_2~local40+1.tar.gz              |  Bin 0 -> 85870 bytes
 .../live-installer_2~local40+1_i386.udeb           |  Bin 0 -> 7260 bytes
 ...es-2.6.18-4-486-di_1.06~backports40+1_i386.udeb |  Bin 0 -> 48690 bytes
 ...es-2.6.18-5-486-di_1.06~backports40+2_i386.udeb |  Bin 0 -> 48678 bytes
 .../nobootloader_1.19~backports40+1.dsc            |   22 ++++
 .../nobootloader_1.19~backports40+1.tar.gz         |  Bin 0 -> 66971 bytes
 .../nobootloader_1.19~backports40+1_all.udeb       |  Bin 0 -> 59578 bytes
 .../pkgsel_0.15~backports40+1.dsc                  |   22 ++++
 .../pkgsel_0.15~backports40+1.tar.gz               |  Bin 0 -> 21468 bytes
 .../pkgsel_0.15~backports40+1_all.udeb             |  Bin 0 -> 6494 bytes
 ...es-2.6.18-4-486-di_1.06~backports40+1_i386.udeb |  Bin 0 -> 17068 bytes
 ...es-2.6.18-5-486-di_1.06~backports40+2_i386.udeb |  Bin 0 -> 17066 bytes
 webconverger/config/binary_syslinux/splash.rle     |  Bin 0 -> 10489 bytes
 webconverger/config/bootstrap                      |   45 +++++---
 webconverger/config/chroot                         |   44 ++++++--
 webconverger/config/chroot_sources/webc.binary     |    2 +
 webconverger/config/chroot_sources/webc.binary.gpg |   31 +++++
 webconverger/config/chroot_sources/webc.bootstrap  |    2 +
 .../config/chroot_sources/webc.list.binary         |    1 -
 .../config/chroot_sources/webc.list.bootstrap      |    2 -
 webconverger/config/common                         |  116 +++++++++++++++-----
 webconverger/config/source                         |   10 ++-
 webconverger/config/templates/grub                 |    1 -
 .../config/templates/syslinux/common/boot.txt      |    2 -
 .../config/templates/syslinux/common/isolinux.cfg  |   36 ------
 .../config/templates/syslinux/common/pxelinux.cfg  |   27 -----
 .../config/templates/syslinux/common/splash.rle    |  Bin 10489 -> 0 bytes
 webconverger/config/templates/syslinux/en/f1.txt   |   25 ----
 webconverger/config/templates/syslinux/en/f10.txt  |   23 ----
 webconverger/config/templates/syslinux/en/f2.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f3.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f4.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f5.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f6.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f7.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f8.txt   |   23 ----
 webconverger/config/templates/syslinux/en/f9.txt   |   23 ----
 58 files changed, 470 insertions(+), 385 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 7394fe402a9f01bf5e89e4e8bd0f7b50b26fa4d0
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 17 13:03:39 2007 +0200

    Updating.

diff --git a/webconverger/config/binary b/webconverger/config/binary
index ad6769e..dfd61b3 100644
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@ -1,47 +1,94 @@
-# config/chroot: configuration for lh_image_*
+# config/binary - options for live-helper(7), binary stage
 
-# Uncomment for final version
+# $LH_BINARY_IMAGES: set image type
+# (Default: iso)
+#LH_BINARY_IMAGES="iso"
+
+# $LH_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: enabled)
+#LH_BINARY_INDICES="enabled"
+
+# $LH_BOOTAPPEND_LIVE: set boot parameters
+# (Default: empty)
 LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconverger.com/"
 
+# $LH_BOOTAPPEND_INSTALL: set boot parameters
+# (Default: empty)
+LH_BOOTAPPEND_INSTALL="preseed/file=/cdrom/install/preseed.cfg d-i:debian-installer/locale=en_US d-i:console-keymaps-at/keymap=us -- ${LH_BOOTAPPEND_LIVE}"
+
+# $LH_BOOTLOADER: set bootloader
+# (Default: syslinux)
+#LH_BOOTLOADER="syslinux"
+
+# ${LH_CHROOT_BUILD: control if we build binary images chrooted
+# (Default: enabled)
+# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
+#LH_CHROOT_BUILD="enabled"
+
+# $LH_DEBIAN_INSTALLER: set debian-installer
+# (Default: disabled)
+#LH_DEBIAN_INSTALLER="disabled"
+
+# $LH_DEBIAN_INSTALLER_DAILY: set daily images
+# (Default: disabled)
+#LH_DEBIAN_INSTALLER_DAILY="disabled"
+
 # $LH_ENCRYPTION: set encrytion
 # (Default: empty)
 #LH_ENCRYPTION=""
 
-# $LH_FILESYSTEM: set filesystem
-# (Default: squashfs)
-#LH_CHROOT_FILESYSTEM="plain"
+# $LH_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+#LH_GRUB_SPLASH=""
 
-# $LH_MEMTEST86: set memtest86+
-# (Default: enabled)
-LH_MEMTEST86="enabled"
+# $LH_HOSTNAME: set hostname
+# (Default: debian)
+LH_HOSTNAME="webconverger"
 
-# $LH_ISO_VOLUME: set iso volume
-# (Default: Debian Live ${DATE})
-LH_ISO_VOLUME="Webconverger ${DATE}"
+# $LH_ISO_APPLICATION: set iso author
+# (Default: Debian Live)
+LH_ISO_APPLICATION="Webconverger"
 
-# $LH_SERVER_ADDRESS: set the netboot server address
-# (Default: 192.168.1.1)
-LH_NET_SERVER="192.168.2.1"
+# $LH_ISO_PREPARER: set iso preparer
+# (Default: live-helper 1.0~a29; http://packages.qa.debian.org/live-helper)
+LH_ISO_PREPARER="live-helper 1.0~a29; http://packages.qa.debian.org/live-helper"
+
+# $LH_ISO_PUBLISHER: set iso preparer
+# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
+LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
+
+# $LH_ISO_VOLUME: set iso volume (max 32 chars)
+# (Default: Debian Live `date +%Y%m%d-%H:%M`)
+LH_ISO_VOLUME="Webconverger `date +%Y%m%d-%H:%M`"
+
+# $LH_MEMTEST: set memtest
+# (Default: memtest86+)
+LH_MEMTEST="none"
 
-# $LH_SERVER_PATH: set the netboot server directory
+# $LH_NET_FILESYSTEM: set netboot filesystem
+# (Default: nfs)
+#LH_NET_FILESYSTEM="nfs"
+
+# $LH_NET_MOUNTOPTIONS: set nfsopts
+# (Default: empty)
+#LH_NET_MOUNTOPTIONS=""
+
+# $LH_NET_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LH_NET_PATH="/srv/debian-live"
+#LH_NET_PATH="/srv/debian-live"
 
-# $LH_SYSLINUX: set syslinux option
-# (Default: enabled)
-#LH_SYSLINUX="enabled"
-#LH_BOOTLOADER="grub"
-#LH_GRUB_SPLASH="/home/hendry/projects/live/daisy.xpm.gz"
+# $LH_NET_SERVER: set netboot server address
+# (Default: 192.168.1.1)
+#LH_NET_SERVER="192.168.1.1"
 
 # $LH_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-#LH_SYSLINUX_SPLASH="/home/hendry/projects/livecd/splash.rle"
+#LH_SYSLINUX_SPLASH=""
 
-# $LH_BINARY_IMAGE: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
+# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
+# (Default: 0)
+LH_SYSLINUX_TIMEOUT="10"
 
-# $LH_TEMPLATES: set templates
-# (Default: /usr/share/live-helper/templates)
-# LH_TEMPLATES="/home/hendry/projects/live/templates/"
-#LH_DEBIAN_INSTALLER="enabled"
+# $LH_USERNAME: set username
+# (Default: user)
+#LH_USERNAME="user"
diff --git a/mini-hd/config/binary_local-udebs/apt-cdrom-setup_0.26~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/apt-cdrom-setup_0.26~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/apt-cdrom-setup_0.26~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/apt-cdrom-setup_0.26~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/apt-mirror-setup_0.26~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/apt-mirror-setup_0.26~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/apt-mirror-setup_0.26~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/apt-mirror-setup_0.26~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/apt-setup-udeb_0.26~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/apt-setup-udeb_0.26~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/apt-setup-udeb_0.26~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/apt-setup-udeb_0.26~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/apt-setup_0.26~backports40+1.dsc b/webconverger/config/binary_local-udebs/apt-setup_0.26~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/apt-setup_0.26~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/apt-setup_0.26~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/apt-setup_0.26~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/apt-setup_0.26~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/apt-setup_0.26~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/apt-setup_0.26~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/base-installer_1.84~backports40+1.dsc b/webconverger/config/binary_local-udebs/base-installer_1.84~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/base-installer_1.84~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/base-installer_1.84~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/base-installer_1.84~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/base-installer_1.84~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/base-installer_1.84~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/base-installer_1.84~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/base-installer_1.84~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/base-installer_1.84~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/base-installer_1.84~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/base-installer_1.84~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/bootstrap-base_1.84~backports40+1_i386.udeb b/webconverger/config/binary_local-udebs/bootstrap-base_1.84~backports40+1_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/bootstrap-base_1.84~backports40+1_i386.udeb
copy to webconverger/config/binary_local-udebs/bootstrap-base_1.84~backports40+1_i386.udeb
diff --git a/mini-hd/config/binary_local-udebs/elilo-installer_1.12~backports40+1.dsc b/webconverger/config/binary_local-udebs/elilo-installer_1.12~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/elilo-installer_1.12~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/elilo-installer_1.12~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/elilo-installer_1.12~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/elilo-installer_1.12~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/elilo-installer_1.12~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/elilo-installer_1.12~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/elilo-installer_1.12~backports40+1_i386.udeb b/webconverger/config/binary_local-udebs/elilo-installer_1.12~backports40+1_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/elilo-installer_1.12~backports40+1_i386.udeb
copy to webconverger/config/binary_local-udebs/elilo-installer_1.12~backports40+1_i386.udeb
diff --git a/mini-hd/config/binary_local-udebs/finish-install_2.13~backports40+1.dsc b/webconverger/config/binary_local-udebs/finish-install_2.13~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/finish-install_2.13~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/finish-install_2.13~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/finish-install_2.13~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/finish-install_2.13~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/finish-install_2.13~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/finish-install_2.13~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/finish-install_2.13~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/finish-install_2.13~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/finish-install_2.13~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/finish-install_2.13~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.dsc b/webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.dsc b/webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.dsc
copy to webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.dsc
diff --git a/mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.tar.gz b/webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.tar.gz
copy to webconverger/config/binary_local-udebs/linux-modules-di-i386-2.6_1.06~backports40+2.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/live-installer_2~local40+1.dsc b/webconverger/config/binary_local-udebs/live-installer_2~local40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/live-installer_2~local40+1.dsc
copy to webconverger/config/binary_local-udebs/live-installer_2~local40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/live-installer_2~local40+1.tar.gz b/webconverger/config/binary_local-udebs/live-installer_2~local40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/live-installer_2~local40+1.tar.gz
copy to webconverger/config/binary_local-udebs/live-installer_2~local40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/live-installer_2~local40+1_i386.udeb b/webconverger/config/binary_local-udebs/live-installer_2~local40+1_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/live-installer_2~local40+1_i386.udeb
copy to webconverger/config/binary_local-udebs/live-installer_2~local40+1_i386.udeb
diff --git a/mini-hd/config/binary_local-udebs/loop-aes-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb b/webconverger/config/binary_local-udebs/loop-aes-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/loop-aes-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb
copy to webconverger/config/binary_local-udebs/loop-aes-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb
diff --git a/mini-hd/config/binary_local-udebs/loop-aes-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb b/webconverger/config/binary_local-udebs/loop-aes-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/loop-aes-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb
copy to webconverger/config/binary_local-udebs/loop-aes-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb
diff --git a/mini-hd/config/binary_local-udebs/nobootloader_1.19~backports40+1.dsc b/webconverger/config/binary_local-udebs/nobootloader_1.19~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/nobootloader_1.19~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/nobootloader_1.19~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/nobootloader_1.19~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/nobootloader_1.19~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/nobootloader_1.19~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/nobootloader_1.19~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/nobootloader_1.19~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/nobootloader_1.19~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/nobootloader_1.19~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/nobootloader_1.19~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/pkgsel_0.15~backports40+1.dsc b/webconverger/config/binary_local-udebs/pkgsel_0.15~backports40+1.dsc
similarity index 100%
copy from mini-hd/config/binary_local-udebs/pkgsel_0.15~backports40+1.dsc
copy to webconverger/config/binary_local-udebs/pkgsel_0.15~backports40+1.dsc
diff --git a/mini-hd/config/binary_local-udebs/pkgsel_0.15~backports40+1.tar.gz b/webconverger/config/binary_local-udebs/pkgsel_0.15~backports40+1.tar.gz
similarity index 100%
copy from mini-hd/config/binary_local-udebs/pkgsel_0.15~backports40+1.tar.gz
copy to webconverger/config/binary_local-udebs/pkgsel_0.15~backports40+1.tar.gz
diff --git a/mini-hd/config/binary_local-udebs/pkgsel_0.15~backports40+1_all.udeb b/webconverger/config/binary_local-udebs/pkgsel_0.15~backports40+1_all.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/pkgsel_0.15~backports40+1_all.udeb
copy to webconverger/config/binary_local-udebs/pkgsel_0.15~backports40+1_all.udeb
diff --git a/mini-hd/config/binary_local-udebs/squashfs-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb b/webconverger/config/binary_local-udebs/squashfs-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/squashfs-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb
copy to webconverger/config/binary_local-udebs/squashfs-modules-2.6.18-4-486-di_1.06~backports40+1_i386.udeb
diff --git a/mini-hd/config/binary_local-udebs/squashfs-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb b/webconverger/config/binary_local-udebs/squashfs-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb
similarity index 100%
copy from mini-hd/config/binary_local-udebs/squashfs-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb
copy to webconverger/config/binary_local-udebs/squashfs-modules-2.6.18-5-486-di_1.06~backports40+2_i386.udeb
diff --git a/webconverger/config/templates/syslinux/common/splash.rle b/webconverger/config/binary_syslinux/splash.rle
similarity index 100%
rename from webconverger/config/templates/syslinux/common/splash.rle
rename to webconverger/config/binary_syslinux/splash.rle
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
index d9775f7..8560176 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -1,24 +1,41 @@
-# config/bootstrap: configuration for lh_bootstrap_*
+# config/bootstrap - options for live-helper(7), bootstrap stage
 
-# $LH_ARCHITECTURE: select the chroot architecture
+# $LH_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
 #LH_ARCHITECTURE="i386"
 
-# $LH_DISTRIBUTION: select the distribution to use
-# (Default: sid)
-LH_DISTRIBUTION="etch"
+# $LH_BOOTSTRAP_CONFIG: set distribution config directory
+# (Default: empty)
+#LH_BOOTSTRAP_CONFIG=""
 
-# $LH_FLAVOUR: select the flavour to use
+# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: standard)
-# LH_FLAVOUR="standard"
+#LH_BOOTSTRAP_FLAVOUR="standard"
+
+# $LH_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+#LH_BOOTSTRAP_KEYRING=""
+
+# $LH_DISTRIBUTION: select distribution to use
+# (Default: lenny)
+LH_DISTRIBUTION="etch"
+
+# $LH_MIRROR_BOOTSTRAP: set mirror to fetch packages from
+# (Default: http://ftp.debian.org/debian/)
+#LH_MIRROR_BOOTSTRAP="http://ftp.debian.org/debian/"
+
+# $LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# (Default: http://security.debian.org/)
+#LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
+
+# $LH_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: http://ftp.debian.org/debian/)
+#LH_MIRROR_BINARY="http://ftp.debian.org/debian/"
 
-#LH_MIRROR_BOOTSTRAP="http://mirror/debian/"
-#LH_MIRROR_BINARY="http://mirror/debian/"
-#LH_MIRROR_BOOTSTRAP_SECURITY="http://mirror/debian-security/"
-#LH_MIRROR_BOOTSTRAP="http://mirror/debian/"
-#LH_MIRROR_BINARY="http://mirror/debian/"
-#LH_MIRROR_BOOTSTRAP_SECURITY="http://mirror/debian-security/"
+# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: http://security.debian.org/)
+#LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
 
-# $LH_SECTIONS: select the section to use
+# $LH_SECTIONS: select section(s) to use
 # (Default: main)
 LH_SECTIONS="main contrib"
diff --git a/webconverger/config/chroot b/webconverger/config/chroot
index d3784b2..75f8871 100644
--- a/webconverger/config/chroot
+++ b/webconverger/config/chroot
@@ -1,22 +1,46 @@
-# config/chroot: configuration for lh_chroot_*
+# config/chroot - options for live-helper(7), chroot stage
 
-# $LH_KERNEL: set the kernel flavour to use
+# $LH_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: squashfs)
+#LH_CHROOT_FILESYSTEM="squashfs"
+
+# $LH_UNION_FILESYSTEM: set union filesystem
+# (Default: unionfs
+#LH_UNION_FILESYSTEM="unionfs"
+
+# $LH_HOOKS: set hook commands
+# (Default: empty)
+#LH_HOOKS=""
+
+# $LH_INTERACTIVE: set interactive build
+# (Default: disabled)
+#LH_INTERACTIVE="disabled"
+
+# $LH_KEYRING_PACKAGES: set keyring packages
+# (Default: empty)
+#LH_KEYRING_PACKAGES=""
+
+# $LH_LANGUAGE: set language to use
+# (Default: empty)
+#LH_LANGUAGE="en"
+
+# $LH_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
 #LH_LINUX_FLAVOURS="486"
 
-# $LH_LANGUAGE: set the language to use
-# (Default: empty)
-#LH_LANGUAGE=""
+# $LH_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+#LH_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6 squashfs-modules-2.6"
 
-# $LH_PACKAGES: set the packages to install
+# $LH_PACKAGES: set packages to install
 # (Default: empty)
 #LH_PACKAGES=""
 
-# $LH_PACKAGES_LIST: set the package list to install
-# (Default: xorg)
-#LH_PACKAGES_LIST="xorg"
+# $LH_PACKAGES_LISTS: set package list to install
+# (Default: standard)
+#LH_PACKAGES_LISTS="standard"
 
-# $LH_TASKS: set the tasks to install
+# $LH_TASKS: set tasks to install
 # (Default: empty)
 #LH_TASKS=""
 
diff --git a/webconverger/config/chroot_local-packageslists/chinese b/webconverger/config/chroot_local-packageslists/chinese
old mode 100755
new mode 100644
diff --git a/webconverger/config/chroot_local-packageslists/japanese b/webconverger/config/chroot_local-packageslists/japanese
old mode 100755
new mode 100644
diff --git a/webconverger/config/chroot_local-packageslists/tor b/webconverger/config/chroot_local-packageslists/tor
old mode 100755
new mode 100644
diff --git a/webconverger/config/chroot_sources/webc.list.bootstrap b/webconverger/config/chroot_sources/webc.binary
similarity index 100%
copy from webconverger/config/chroot_sources/webc.list.bootstrap
copy to webconverger/config/chroot_sources/webc.binary
diff --git a/webconverger/config/chroot_sources/webc.bootstrap.gpg b/webconverger/config/chroot_sources/webc.binary.gpg
similarity index 100%
copy from webconverger/config/chroot_sources/webc.bootstrap.gpg
copy to webconverger/config/chroot_sources/webc.binary.gpg
diff --git a/webconverger/config/chroot_sources/webc.list.bootstrap b/webconverger/config/chroot_sources/webc.bootstrap
similarity index 100%
rename from webconverger/config/chroot_sources/webc.list.bootstrap
rename to webconverger/config/chroot_sources/webc.bootstrap
diff --git a/webconverger/config/chroot_sources/webc.list.binary b/webconverger/config/chroot_sources/webc.list.binary
deleted file mode 120000
index f207d43..0000000
--- a/webconverger/config/chroot_sources/webc.list.binary
+++ /dev/null
@@ -1 +0,0 @@
-webc.list.bootstrap
\ No newline at end of file
diff --git a/webconverger/config/common b/webconverger/config/common
index f239ee1..cca36d1 100644
--- a/webconverger/config/common
+++ b/webconverger/config/common
@@ -1,57 +1,115 @@
-# config/common: configuration for live-helper(7)
-#
-LH_INITRAMFS="live-initramfs"
+# config/common - common options for live-helper(7)
 
 # $LH_APT: set package manager
 # (Default: aptitude)
-#LH_APT="apt-get"
+#LH_APT="aptitude"
 
-# $LH_APT_FTPPROXY: set apt/aptitude ftp proxy
+# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
 # (Default: autodetected or empty)
-#LH_APT_FTPPROXY=""
+#LH_APT_FTP_PROXY=""
 
-# $LH_APT_HTTPPROXY: set apt/aptitude http proxy
+# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
 # (Default: autodetected or empty)
-#LH_APT_HTTPPROXY=""
-
-# $LH_APT_GENERIC: set apt/aptitude generic indices
-# (Default: enabled)
-#LH_APT_GENERIC="enabled"
+#LH_APT_HTTP_PROXY=""
 
 # $LH_APT_PDIFFS: set apt/aptitude pdiff indices
 # (Default: enabled)
 #LH_APT_PDIFFS="enabled"
 
-# $LH_APT_RECOMMENDS: enable recommends
+# $LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: )
+#LH_APT_PIPELINE=""
+
+# $LH_APT_RECOMMENDS: set apt/aptitude recommends
 # (Default: enabled)
 LH_APT_RECOMMENDS="disabled"
 
-# $LH_BOOTSTRAP: select the bootstrap program
-# (Default: cdebootstrap)
-#LH_BOOTSTRAP="cdebootstrap"
+# $LH_APT_SECURE: set apt/aptitude security
+# (Default: enabled)
+#LH_APT_SECURE="enabled"
+
+# $LH_BOOTSTRAP: set bootstrap program
+# (Default: debootstrap)
+#LH_BOOTSTRAP="debootstrap"
 
-# $LH_CACHE: enable cache
+# $LH_CACHE: control cache
 # (Default: enabled)
 #LH_CACHE="enabled"
 
-# $LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use
+# $LH_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: disabled)
+#LH_CACHE_INDICES="disabled"
+
+# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: enabled)
+#LH_CACHE_PACKAGES="enabled"
+
+# $LH_CACHE_STAGES: control if completed stages should be cached
+# (Default: bootstrap)
+#LH_CACHE_STAGES="bootstrap"
+
+# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
 # (Default: noninteractive)
 #LH_DEBCONF_FRONTEND="noninteractive"
 
-# $LH_DEBCONF_PRIORITY: set the debconf(1) priority to use
+# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: yes)
+#LH_DEBCONF_NOWARNINGS="yes"
+
+# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
 # (Default: critical)
 #LH_DEBCONF_PRIORITY="critical"
 
-# $LH_GENISOIMAGE: set the genisoimage program
-# (Default: autodetected)
+# $LH_GENISOIMAGE: set genisoimage program
+# (Default: genisoimage)
 #LH_GENISOIMAGE="genisoimage"
 
-# $LH_ROOT: set the root directory
-# (Default: `pwd`/debian-live)
-#LH_ROOT="/tmp/wc/debian-live"
+# $LH_INITRAMFS: set initramfs hook
+# (Default: auto)
+LH_INITRAMFS="live-initramfs"
+
+# $LH_LOSETUP: set losetup program
+# (Default: autodetected)
+#LH_LOSETUP="losetup"
+
+# $LH_MODE: set distribution mode
+# (Default: debian)
+#LH_MODE="debian"
+
+# $LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# $LH_TASKSEL: set tasksel program
+# (Default: aptitude)
+#LH_TASKSEL="aptitude"
+
+# $LH_INCLUDES: set includes
+# (Default: /usr/share/live-helper/includes)
+LH_INCLUDES="none"
+
+# $LH_TEMPLATES: set templates
+# (Default: /usr/share/live-helper/templates)
+LH_TEMPLATES="none"
+
+# Live-helper options
+
+# $LH_BREAKPOINTS: enable breakpoints
+# (Default: disabled)
+#LH_BREAKPOINTS="disabled"
+
+# $LH_DEBUG: enable debug
+# (Default: disabled)
+#LH_DEBUG="disabled"
+
+# $LH_FORCE: enable force
+# (Default: disabled)
+#LH_FORCE="disabled"
+
+# $LH_QUIET: enable quiet
+# (Default: disabled)
+#LH_QUIET="disabled"
 
-# $LH_CHROOT: set the chroot directory
-# (Default: ${LH_ROOT}/chroot)
-#LH_CHROOT="/tmp/wc/debian-live/chroot"
-#
-#LH_BREAKPOINTS="enabled"
+# $LH_VERBOSE: enable verbose
+# (Default: disabled)
+#LH_VERBOSE="disabled"
diff --git a/webconverger/config/source b/webconverger/config/source
index 4f32421..94a8973 100644
--- a/webconverger/config/source
+++ b/webconverger/config/source
@@ -1,3 +1,9 @@
+# config/source - options for live-helper(7), source stage
+
 # $LH_SOURCE: set source option
-# (Default: )
-#LH_SOURCE="enabled"
+# (Default: disabled)
+#LH_SOURCE="disabled"
+
+# $LH_SOURCE_IMAGES: set image type
+# (Default: tar)
+#LH_SOURCE_IMAGES="tar"
diff --git a/webconverger/config/templates/grub b/webconverger/config/templates/grub
deleted file mode 120000
index 988ebcc..0000000
--- a/webconverger/config/templates/grub
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/live-helper/templates/grub
\ No newline at end of file
diff --git a/webconverger/config/templates/syslinux/common/boot.txt b/webconverger/config/templates/syslinux/common/boot.txt
deleted file mode 100644
index d316e96..0000000
--- a/webconverger/config/templates/syslinux/common/boot.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Press F1control and F then 1 for help, or ENTER to 
diff --git a/webconverger/config/templates/syslinux/common/isolinux.cfg b/webconverger/config/templates/syslinux/common/isolinux.cfg
deleted file mode 100644
index e538132..0000000
--- a/webconverger/config/templates/syslinux/common/isolinux.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-DISPLAY boot.txt
-
-F1 f1.txt
-F2 f2.txt
-F3 f3.txt
-F4 f4.txt
-F5 f5.txt
-F6 f6.txt
-F7 f7.txt
-F8 f8.txt
-F9 f9.txt
-F0 f10.txt
-
-DEFAULT live
-
-LINUX_LIVE
-
-LINUX_INSTALL
-
-MEMTEST
-
-#LABEL floppy
-#	localboot 0x00
-
-#LABEL disk1
-#	localboot 0x80
-
-#LABEL disk2
-#	localboot 0x81
-
-#LABEL nextboot
-#	localboot -1
-
-PROMPT 1
-TIMEOUT 10
diff --git a/webconverger/config/templates/syslinux/common/pxelinux.cfg b/webconverger/config/templates/syslinux/common/pxelinux.cfg
deleted file mode 100644
index 51c889a..0000000
--- a/webconverger/config/templates/syslinux/common/pxelinux.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-default live
-label live
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label nfs
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot=nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label nfslegacy
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper root=/dev/nfs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label cifs
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper netboot=cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label cifslegacy
-  kernel vmlinuz
-  append initrd=initrd.img boot=casper root=/dev/cifs nfsroot=LIVE_NET_SERVER:LIVE_NET_PATH LIVE_BOOTAPPEND
-label memtest
-  kernel memtest
-display pxelinux.cfg/isolinux.txt
-timeout 5
-prompt 1
-F1 pxelinux.cfg/f1.txt
-F3 pxelinux.cfg/f3.txt
-F4 pxelinux.cfg/f4.txt
-F8 pxelinux.cfg/f8.txt
-F9 pxelinux.cfg/f9.txt
-F0 pxelinux.cfg/f10.txt
diff --git a/webconverger/config/templates/syslinux/en/f1.txt b/webconverger/config/templates/syslinux/en/f1.txt
deleted file mode 100644
index 2e8656c..0000000
--- a/webconverger/config/templates/syslinux/en/f1.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-                  0fWelcome to Debian GNU/Linux!07                                09F107
-
-This is a Debian Live CD-ROM.
-It was built on LIVE_DATE.
-
-0fHELP INDEX07
-
-0fKEY    TOPIC07
-
-<09F107>   This page, the help index.
-<09F207>   Prerequisites for installing Debian.
-<09F307>   Boot methods for special ways of using this CD-ROM
-<09F407>   Additional boot methods; live and rescue modes.
-<09F507>   Special boot parameters, overview.
-<09F607>   Special boot parameters for special machines.
-<09F707>   Special boot parameters for selected disk controllers.
-<09F807>   Special boot parameters for the install system.
-<09F907>   How to get help.
-<09F1007>  Copyrights and warranties.
-
-For F1-F9 type control and F then the digit 1-9
-For F10 type control and F then the digit 0
-
-
-Press F2 through F10 for details, or ENTER to 
diff --git a/webconverger/config/templates/syslinux/en/f10.txt b/webconverger/config/templates/syslinux/en/f10.txt
deleted file mode 100644
index a1ce656..0000000
--- a/webconverger/config/templates/syslinux/en/f10.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fCOPYRIGHTS AND WARRANTIES07                                                    09F1007
-
-Debian GNU/Linux is Copyright (C) 1993-2007 Software in the Public Interest,
-and others.
-
-The Debian GNU/Linux system is freely redistributable. After installation,
-the exact distribution terms for each package are described in the
-corresponding file /usr/share/doc/0bpackagename07/copyright.
-
-Debian GNU/Linux comes with 0fABSOLUTELY NO WARRANTY07, to the extent
-permitted by applicable law.
-
----
-
-This Debian Live system was built with live-helper, version LIVE_VERSION.
-
-More information about the Debian Live project can be found at
-<http://debian-live.alioth.debian.org/>.
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to 
diff --git a/webconverger/config/templates/syslinux/en/f2.txt b/webconverger/config/templates/syslinux/en/f2.txt
deleted file mode 100644
index 60243d3..0000000
--- a/webconverger/config/templates/syslinux/en/f2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fPREREQUISITES FOR INSTALLING DEBIAN07                                           09F207
-
-You must have at least 32 megabytes of RAM to use this 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, 0fhttp://www.debian.org/07
-
-Thank you for choosing Debian!
-
-
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/webconverger/config/templates/syslinux/en/f3.txt b/webconverger/config/templates/syslinux/en/f3.txt
deleted file mode 100644
index 5f3996f..0000000
--- a/webconverger/config/templates/syslinux/en/f3.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fBOOT METHODS07                                                                  09F307
-
-
-0fAvailable boot methods:07
-
-0finstall07
-  Start the installation.
-0finstallgui07
-  Start the installation using the graphical installer.
-0fexpert07
-  Start the installation in expert mode, for maximum control.
-0fexpertgui07
-  Start the installation in expert mode using the graphical installer.
-
-To use one of these boot methods, type it at the prompt, optionally
-followed by any boot parameters. For example:
-
-  boot: install acpi=off
-
-If unsure, you should use the default boot method, with no special
-parameters, by simply pressing enter at the boot prompt.
-
-Press F1control and F then 1 for the help index, or ENTER to 
diff --git a/webconverger/config/templates/syslinux/en/f4.txt b/webconverger/config/templates/syslinux/en/f4.txt
deleted file mode 100644
index 1167738..0000000
--- a/webconverger/config/templates/syslinux/en/f4.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fLIVE AND RESCUE MODES07                                                         09F407
-
-
-0fUse one of these boot methods to start the live system07
-
-0flive07
-  Start the live system in standard mode -- this is the default.
-0flive-failsafe07
-  Start the live system in failsafe mode.
-
-0fUse one of these boot methods to rescue an existing install07
-
-0frescue07
-  Boot into rescue mode.
-0frescuegui07
-  Boot into rescue mode using the graphical installer.
-
-0fmemtest07
-  Run memtest86+ (memory tester).
-0ffloppy07, 0fdisk107 or 0fdisk207
-  Boot from the floppy, first or second hard disk.
-
-Press F1control and F then 1 for the help index, or ENTER to 
diff --git a/webconverger/config/templates/syslinux/en/f5.txt b/webconverger/config/templates/syslinux/en/f5.txt
deleted file mode 100644
index 6e73913..0000000
--- a/webconverger/config/templates/syslinux/en/f5.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fSPECIAL BOOT PARAMETERS - OVERVIEW07                                            09F507
-
-On a few systems, you may need to specify a parameter at the 0fboot:07
-prompt in order to boot the system. For example, Linux may not be able
-to autodetect your hardware, and you may need to explicitly specify
-its location or type for it to be recognized.
-
-For more information about what boot parameters you can use, press:
-
- <09F607> -- boot parameters for special machines
- <09F707> -- boot parameters for various disk controllers
- <09F807> -- boot parameters understood by the install system
-
-Note that to specify a parameter for a particular kernel module, use the form
-module.param=value, for example: libata.atapi_enabled=1
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/webconverger/config/templates/syslinux/en/f6.txt b/webconverger/config/templates/syslinux/en/f6.txt
deleted file mode 100644
index 4bdb09a..0000000
--- a/webconverger/config/templates/syslinux/en/f6.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fSPECIAL BOOT PARAMETERS - VARIOUS HARDWARE07                                    09F607
-
-You can use the following boot parameters at the 0fboot:07 prompt, 
-in combination with the boot method (see <09F307>).
-If you use hex numbers you have to use the 0x prefix (e.g., 0x300).
-0f
-HARDWARE                               PARAMETER TO SPECIFY07
-IBM PS/1 or ValuePoint (IDE disk)      0fhd=0bcylinders0f,0bheads0f,0bsectors07
-Some IBM ThinkPads                     0ffloppy.floppy=thinkpad07
-IBM Pentium Microchannel               0fmca-pentium no-hlt07
-Protect I/O port regions               0freserve=0biobase0f,0bextent07[0f,0b...07]
-Workaround faulty FPU (old machines)   0fno38707
-Laptops with screen display problems   0fvga=77107
-Use first serial port at 9600 baud     0fconsole=ttyS0,9600n807
-Force use of generic IDE driver        0fgeneric.all_generic_ide=107
-
-If you experience lockups or other hardware failures,
-disable buggy APIC interrupt routing   0fnoapic nolapic07
-
-For example:
-  boot: install vga=771 noapic nolapic
-
-Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/webconverger/config/templates/syslinux/en/f7.txt b/webconverger/config/templates/syslinux/en/f7.txt
deleted file mode 100644
index 48f76c9..0000000
--- a/webconverger/config/templates/syslinux/en/f7.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fSPECIAL BOOT PARAMETERS - VARIOUS DISK DRIVES07                                 09F707
-
-You can use the following boot parameters at the 0fboot:07 prompt, 
-in combination with the boot method (see <09F307>).
-0f
-HARDWARE                     PARAMETER TO SPECIFY07
-Adaptec 151x, 152x           0faha152x.aha152x=0biobase07[0f,0birq07[0f,0bscsi-id07[0f,0breconnect07]]]
-Adaptec 1542                 0faha1542.aha1542=0biobase07[0f,0bbuson0f,0bbusoff07[0f,0bdmaspeed07]]
-Adaptec 274x, 284x           0faic7xxx.aic7xxx=no_reset07    (enabled if non-zero)
-BusLogic SCSI Hosts          0fBusLogic.BusLogic=0biobase07
-Certain DELL machines        0faic7xxx.aic7xxx=no_probe07
-
-This list is incomplete, see the kernel's kernel-parameters.txt file
-for more.
-
-
-
-
-For example:
-
-  boot: install aic7xxx.aic7xxx=no_probe
-
-Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/webconverger/config/templates/syslinux/en/f8.txt b/webconverger/config/templates/syslinux/en/f8.txt
deleted file mode 100644
index 04341b6..0000000
--- a/webconverger/config/templates/syslinux/en/f8.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fSPECIAL BOOT PARAMETERS - INSTALLATION SYSTEM07                                 09F807
-
-You can use the following boot parameters at the 0fboot:07 prompt, 
-in combination with the boot method (see <09F307>). These parameters
-control how the installer works.
-0f
-RESULT                                  PARAMETER07
-Verbose debugging                       0fDEBCONF_DEBUG=507
-Debug boot sequence                     0fBOOT_DEBUG=2|307
-Disable framebuffer                     0ffb=false07
-Don't probe for USB                     0fdebian-installer/probe/usb=false07
-Don't start PCMCIA                      0fhw-detect/start_pcmcia=false07
-Force static network config             0fnetcfg/disable_dhcp=true07
-Set keyboard map                        0fbootkbd=es07
-Use Braille tty                         0fbrltty=driver,device,texttable07
-Use high contrast accessibility theme   0ftheme=dark07
-Use special tasks                       0ftasks="kde-desktop, standard"07
-
-For example:
-
-  boot: install fb=false
-
-Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/webconverger/config/templates/syslinux/en/f9.txt b/webconverger/config/templates/syslinux/en/f9.txt
deleted file mode 100644
index b0cac8d..0000000
--- a/webconverger/config/templates/syslinux/en/f9.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-0fGETTING HELP07                                                                  09F907
-
-If you can't install Debian, don't despair! The Debian team is ready to
-help you! We are especially interested in hearing about installation
-problems, because in general they don't happen to only 0fone07 person.
-We've either already heard about your particular problem and can dispense a
-quick fix, or we would like to hear about it and work through it with you,
-and the next user who comes up with the same problem will profit from your
-experience!
-
-See the Installation Manual or the FAQ for more information; both
-documents are available at the Debian web site, 0fhttp://www.debian.org/07
-
-
-
-
-
-
-
-
-
-
-Press F1control and F then 1 for the help index, or ENTER to 
\ No newline at end of file
diff --git a/webconverger/deploy-webc.sh b/webconverger/deploy-webc.sh
old mode 100644
new mode 100755
diff --git a/webconverger/lh_server_net b/webconverger/lh_server_net
old mode 100644
new mode 100755

-- 
debian-live/config-webc



More information about the debian-live-changes mailing list