[SCM] debian-live/config-webc branch, master, updated. 6821f6193bc883130b39e8f23bfab5a56d214550
Daniel Baumann
daniel at debian.org
Fri Feb 29 20:26:40 UTC 2008
The following commit has been merged in the master branch:
commit 6821f6193bc883130b39e8f23bfab5a56d214550
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Feb 29 21:26:37 2008 +0100
Updating config core files to new live-helper.
diff --git a/webconverger/config/binary b/webconverger/config/binary
index 963d1d7..e74a5be 100644
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@ -1,8 +1,12 @@
# config/binary - options for live-helper(7), binary stage
+# $LH_BINARY_FILESYSTEM: set image filesystem
+# (Default: fat16)
+#LH_BINARY_FILESYSTEM="fat16"
+
# $LH_BINARY_IMAGES: set image type
# (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
+#LH_BINARY_IMAGES="iso"
# $LH_BINARY_INDICES: set apt/aptitude generic indices
# (Default: enabled)
@@ -14,11 +18,15 @@ LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconve
# $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_BOOTAPPEND_INSTALL="auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- ${LH_BOOTAPPEND_LIVE}"
# $LH_BOOTLOADER: set bootloader
# (Default: syslinux)
-#LH_BOOTLOADER="grub"
+#LH_BOOTLOADER="syslinux"
+
+# $LH_CHECKSUMS: set checksums
+# (Default: enabled)
+#LH_CHECKSUMS="enabled"
# ${LH_CHROOT_BUILD: control if we build binary images chrooted
# (Default: enabled)
@@ -27,11 +35,11 @@ LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconve
# $LH_DEBIAN_INSTALLER: set debian-installer
# (Default: disabled)
-#LH_DEBIAN_INSTALLER="disabled"
+LH_DEBIAN_INSTALLER="live"
# $LH_DEBIAN_INSTALLER_DAILY: set daily images
# (Default: disabled)
-#LH_DEBIAN_INSTALLER_DAILY="disabled"
+LH_DEBIAN_INSTALLER_DAILY="enabled"
# $LH_ENCRYPTION: set encrytion
# (Default: empty)
@@ -50,45 +58,85 @@ LH_HOSTNAME="webconverger"
LH_ISO_APPLICATION="Webconverger"
# $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"
+# (Default: live-helper 1.0~a38; http://packages.qa.debian.org/live-helper)
+#LH_ISO_PREPARER="live-helper 1.0~a38; http://packages.qa.debian.org/live-helper"
-# $LH_ISO_PUBLISHER: set iso preparer
+# $LH_ISO_PUBLISHER: set iso publisher
# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
LH_ISO_PUBLISHER="Webconverger; http://webconverger.com/; support at webconverger.com"
# $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`"
+# (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_MEMTEST="memtest86+"
-# $LH_NET_FILESYSTEM: set netboot filesystem
+# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
# (Default: nfs)
-#LH_NET_FILESYSTEM="nfs"
+#LH_NET_ROOT_FILESYSTEM="nfs"
-# $LH_NET_MOUNTOPTIONS: set nfsopts
+# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
# (Default: empty)
-#LH_NET_MOUNTOPTIONS=""
+#LH_NET_ROOT_MOUNTOPTIONS=""
-# $LH_NET_PATH: set netboot server directory
+# $LH_NET_ROOT_PATH: set netboot server directory
# (Default: /srv/debian-live)
-#LH_NET_PATH="/srv/debian-live"
+#LH_NET_ROOT_PATH="/srv/debian-live"
-# $LH_NET_SERVER: set netboot server address
+# $LH_NET_ROOT_SERVER: set netboot server address
# (Default: 192.168.1.1)
-#LH_NET_SERVER="192.168.1.1"
+#LH_NET_ROOT_SERVER="192.168.1.1"
+
+# $LH_NET_COW_FILESYSTEM: set net client cow filesystem
+# (Default: nfs)
+#LH_NET_COW_FILESYSTEM="nfs"
+
+# $LH_NET_COW_MOUNTOPTIONS: set cow mount options
+# (Default: empty)
+#LH_NET_COW_MOUNTOPTIONS=""
+
+# $LH_NET_COW_PATH: set cow directory
+# (Default: )
+#LH_NET_COW_PATH=""
+
+# $LH_NET_COW_SERVER: set cow server
+# (Default: )
+#LH_NET_COW_SERVER=""
+
+# $LH_NET_TARBALL: set net tarball
+# (Default: gzip)
+#LH_NET_TARBALL="gzip"
# $LH_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
#LH_SYSLINUX_SPLASH=""
-# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
+# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
# (Default: 0)
LH_SYSLINUX_TIMEOUT="10"
+# $LH_SYSLINUX_CFG: set custom syslinux configuration file
+# (Default: empty)
+#LH_SYSLINUX_CFG=""
+
+# $LH_SYSLINUX_MENU: set syslinux menu
+# (Default: disabled)
+#LH_SYSLINUX_MENU="disabled"
+
+# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
+# (Default: Start Debian Live)
+#LH_SYSLINUX_MENU_LIVE_ENTRY="Start Debian Live"
+
+# $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
+# (Default: )
+#LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY=""
+
+# $LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
+# (Default: Memory test)
+#LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
+
# $LH_USERNAME: set username
# (Default: user)
#LH_USERNAME="user"
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
index 3b1ee34..c71b649 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -2,15 +2,23 @@
# $LH_ARCHITECTURE: select chroot architecture
# (Default: autodetected)
-LH_ARCHITECTURE="i386"
+#LH_ARCHITECTURE="i386"
# $LH_BOOTSTRAP_CONFIG: set distribution config directory
# (Default: empty)
#LH_BOOTSTRAP_CONFIG=""
+# $LH_BOOTSTRAP_INCLUDE: include packages on base
+# (Default: empty)
+#LH_BOOTSTRAP_INCLUDE=""
+
+# $LH_BOOTSTRAP_EXCLUDE: exclude packages on base
+# (Default: empty)
+#LH_BOOTSTRAP_EXCLUDE=""
+
# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: standard)
-#LH_BOOTSTRAP_FLAVOUR="standard"
+# (Default: )
+#LH_BOOTSTRAP_FLAVOUR=""
# $LH_BOOTSTRAP_KEYRING: set distribution keyring
# (Default: empty)
@@ -20,21 +28,25 @@ LH_ARCHITECTURE="i386"
# (Default: lenny)
LH_DISTRIBUTION="lenny"
-# $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: set mirror to boostrap from
+# (Default: http://ftp.us.debian.org/debian/)
+LH_MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
+
+# $LH_MIRROR_CHROOT: set mirror to fetch packages from
+# (Default: http://ftp.us.debian.org/debian/)
+LH_MIRROR_CHROOT="http://ftp.de.debian.org/debian/"
-# $LH_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from
+# $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
# (Default: http://security.debian.org/)
-#LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
+LH_MIRROR_CHROOT_SECURITY="http://ftp.de.debian.org/debian-security/"
# $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/"
+# (Default: http://ftp.us.debian.org/debian/)
+LH_MIRROR_BINARY="http://ftp.de.debian.org/debian/"
# $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_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
# $LH_SECTIONS: select section(s) to use
# (Default: main)
diff --git a/webconverger/config/chroot b/webconverger/config/chroot
index d57afb7..a7d52fd 100644
--- a/webconverger/config/chroot
+++ b/webconverger/config/chroot
@@ -5,7 +5,12 @@
#LH_CHROOT_FILESYSTEM="squashfs"
# $LH_UNION_FILESYSTEM: set union filesystem
-LH_UNION_FILESYSTEM="aufs"
+# (Default: aufs)
+#LH_UNION_FILESYSTEM="aufs"
+
+# $LH_EXPOSED_ROOT: expose root as read only
+# (Default: disabled)
+#LH_EXPOSED_ROOT="disabled"
# $LH_HOOKS: set hook commands
# (Default: empty)
@@ -29,7 +34,7 @@ LH_UNION_FILESYSTEM="aufs"
# $LH_LINUX_PACKAGES: set kernel packages to use
# (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6"
+#LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6"
# $LH_PACKAGES: set packages to install
# (Default: empty)
diff --git a/webconverger/config/common b/webconverger/config/common
index 9dc899f..7f779e8 100644
--- a/webconverger/config/common
+++ b/webconverger/config/common
@@ -10,7 +10,7 @@
# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
# (Default: autodetected or empty)
-#LH_APT_HTTP_PROXY="http://localhost:3128/"
+#LH_APT_HTTP_PROXY=""
# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
# (Default: enabled)
@@ -60,13 +60,13 @@ LH_APT_RECOMMENDS="disabled"
# (Default: critical)
#LH_DEBCONF_PRIORITY="critical"
-# $LH_GENISOIMAGE: set genisoimage program
-# (Default: genisoimage)
-#LH_GENISOIMAGE="genisoimage"
-
# $LH_INITRAMFS: set initramfs hook
# (Default: auto)
-LH_INITRAMFS="live-initramfs"
+#LH_INITRAMFS="auto"
+
+# $LH_FDISK: set fdisk program
+# (Default: autodetected)
+#LH_FDISK="fdisk"
# $LH_LOSETUP: set losetup program
# (Default: autodetected)
@@ -80,6 +80,10 @@ LH_INITRAMFS="live-initramfs"
# (Default: empty)
#LH_ROOT_COMMAND="sudo"
+# $LH_USE_FAKEROOT: use fakeroot/fakechroot
+# (Default: disabled)
+#LH_USE_FAKEROOT="disabled"
+
# $LH_TASKSEL: set tasksel program
# (Default: aptitude)
#LH_TASKSEL="aptitude"
@@ -113,3 +117,7 @@ LH_INITRAMFS="live-initramfs"
# $LH_VERBOSE: enable verbose
# (Default: disabled)
#LH_VERBOSE="disabled"
+
+# Internal stuff (FIXME)
+#APT_OPTIONS="--yes"
+#APTITUDE_OPTIONS="--assume-yes"
--
debian-live/config-webc
More information about the debian-live-changes
mailing list