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

Kai Hendry hendry at iki.fi
Sun Feb 1 21:51:06 UTC 2009


The following commit has been merged in the master branch:
commit b6a8d6ac1d8a8226bd11b1254c8739b7f705d3d6
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Feb 1 22:50:56 2009 +0100

    these files are generated on the fly by lh_config in scripts/ now

diff --git a/webconverger/config/binary b/webconverger/config/binary
deleted file mode 100644
index 4e1b6b6..0000000
--- a/webconverger/config/binary
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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: usb-hdd)
-LH_BINARY_IMAGES="usb-hdd"
-
-# $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 homepage=http://portal.webconverger.com/ nonetworking nosudo splash vga=791"
-
-# $LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_INSTALL="file=/hd-media/install//preseed.cfg -- ${LH_BOOTAPPEND_LIVE}"
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LH_BOOTLOADER="syslinux"
-
-# $LH_CHECKSUMS: set checksums
-# (Default: enabled)
-LH_CHECKSUMS="enabled"
-
-# ${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_DISTRIBUTION: set debian-installer suite
-# (Default: empty)
-LH_DEBIAN_INSTALLER_DISTRIBUTION="lenny"
-
-# $LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
-# (Default: /preseed.cfg)
-LH_DEBIAN_INSTALLER_PRESEEDFILE="/preseed.cfg"
-
-# $LH_ENCRYPTION: set encryption
-# (Default: disabled)
-LH_ENCRYPTION="disabled"
-
-# $LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LH_GRUB_SPLASH=""
-
-# $LH_HOSTNAME: set hostname
-# (Default: webconverger)
-LH_HOSTNAME="webconverger"
-
-# $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LH_ISO_APPLICATION="Debian Live"
-
-# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper $VERSION; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper $VERSION; http://packages.qa.debian.org/live-helper"
-
-# $LH_ISO_PUBLISHER: set iso publisher
-# (Default: Webconverger; http://webconverger.com/; support at webconverger.com)
-LH_ISO_PUBLISHER="Webconverger; http://webconverger.com/; support at webconverger.com"
-
-# $LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Webconverger 20090201-22:38)
-LH_ISO_VOLUME="Webconverger 20090201-22:38"
-
-# $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
-# (Default: unset)
-LH_JFFS2_ERASEBLOCK=""
-
-# $LH_MEMTEST: set memtest
-# (Default: none)
-LH_MEMTEST="none"
-
-# $LH_WIN32_LOADER: set win32-loader
-# (Default: enabled)
-LH_WIN32_LOADER="enabled"
-
-# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
-# (Default: nfs)
-LH_NET_ROOT_FILESYSTEM="nfs"
-
-# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-LH_NET_ROOT_MOUNTOPTIONS=""
-
-# $LH_NET_ROOT_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-LH_NET_ROOT_PATH="/srv/debian-live"
-
-# $LH_NET_ROOT_SERVER: set netboot server address
-# (Default: 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 in seconds
-# (Default: 0)
-LH_SYSLINUX_TIMEOUT="0"
-
-# $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: webc)
-LH_USERNAME="webc"
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
deleted file mode 100644
index 9d739d4..0000000
--- a/webconverger/config/bootstrap
+++ /dev/null
@@ -1,53 +0,0 @@
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# $LH_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-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: empty)
-LH_BOOTSTRAP_FLAVOUR=""
-
-# $LH_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LH_BOOTSTRAP_KEYRING=""
-
-# $LH_DISTRIBUTION: select distribution to use
-# (Default: lenny)
-LH_DISTRIBUTION="lenny"
-
-# $LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: http://mirror.webconverger.com/debian/)
-LH_MIRROR_BOOTSTRAP="http://mirror.webconverger.com/debian/"
-
-# $LH_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: http://mirror.webconverger.com/debian/)
-LH_MIRROR_CHROOT="http://mirror.webconverger.com/debian/"
-
-# $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
-# (Default: http://ftp.de.debian.org/debian-security/)
-LH_MIRROR_CHROOT_SECURITY="http://ftp.de.debian.org/debian-security/"
-
-# $LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://mirror.webconverger.com/debian/)
-LH_MIRROR_BINARY="http://mirror.webconverger.com/debian/"
-
-# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: http://ftp.de.debian.org/debian-security/)
-LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
-
-# $LH_CATEGORIES: select categories to use
-# (Default: main contrib non-free)
-LH_CATEGORIES="main contrib non-free"
diff --git a/webconverger/config/chroot b/webconverger/config/chroot
deleted file mode 100644
index 7d2f97a..0000000
--- a/webconverger/config/chroot
+++ /dev/null
@@ -1,61 +0,0 @@
-# config/chroot - options for live-helper(7), chroot stage
-
-# $LH_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: squashfs)
-LH_CHROOT_FILESYSTEM="squashfs"
-
-# $LH_UNION_FILESYSTEM: set union filesystem
-# (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)
-LH_HOOKS=""
-
-# $LH_INTERACTIVE: set interactive build
-# (Default: disabled)
-LH_INTERACTIVE="disabled"
-
-# $LH_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LH_KEYRING_PACKAGES="debian-archive-keyring"
-
-# $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_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_PACKAGES: set packages to install
-# (Default: empty)
-LH_PACKAGES=""
-
-# $LH_PACKAGES_LISTS: set package list to install
-# (Default: chinese iceweasel-l10n japanese korean myspell printing webconverger)
-LH_PACKAGES_LISTS="chinese iceweasel-l10n japanese korean myspell printing webconverger"
-
-# $LH_TASKS: set tasks to install
-# (Default: empty)
-LH_TASKS=""
-
-# $LH_SECURITY: enable security updates
-# (Default: enabled)
-LH_SECURITY="enabled"
-
-# $LH_SYMLINKS: enable symlink convertion
-# (Default: disabled)
-LH_SYMLINKS="disabled"
-
-# $LH_SYSVINIT: enable sysvinit
-# (Default: disabled)
-LH_SYSVINIT="disabled"
diff --git a/webconverger/config/common b/webconverger/config/common
deleted file mode 100644
index a4b384f..0000000
--- a/webconverger/config/common
+++ /dev/null
@@ -1,127 +0,0 @@
-# config/common - common options for live-helper(7)
-
-# $LH_APT: set package manager
-# (Default: apt)
-LH_APT="apt"
-
-# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTP_PROXY=""
-
-# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTP_PROXY=""
-
-# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: enabled)
-LH_APT_PDIFFS="enabled"
-
-# $LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: )
-LH_APT_PIPELINE=""
-
-# $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: disabled)
-LH_APT_RECOMMENDS="disabled"
-
-# $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: control cache
-# (Default: enabled)
-LH_CACHE="enabled"
-
-# $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_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_INITRAMFS: set initramfs hook
-# (Default: auto)
-LH_INITRAMFS="auto"
-
-# $LH_FDISK: set fdisk program
-# (Default: autodetected)
-LH_FDISK="fdisk"
-
-# $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_USE_FAKEROOT: use fakeroot/fakechroot
-# (Default: disabled)
-LH_USE_FAKEROOT="disabled"
-
-# $LH_TASKSEL: set tasksel program
-# (Default: tasksel)
-LH_TASKSEL="tasksel"
-
-# $LH_INCLUDES: set includes
-# (Default: /usr/share/live-helper/includes)
-LH_INCLUDES="/usr/share/live-helper/includes"
-
-# $LH_TEMPLATES: set templates
-# (Default: /usr/share/live-helper/templates)
-LH_TEMPLATES="/usr/share/live-helper/templates"
-
-# Live-helper options
-
-# $_BREAKPOINTS: enable breakpoints
-# (Default: disabled)
-#_BREAKPOINTS="disabled"
-
-# $_DEBUG: enable debug
-# (Default: disabled)
-#_DEBUG="disabled"
-
-# $_COLOR: enable color
-# (Default: false)
-#_COLOR="false"
-
-# $_FORCE: enable force
-# (Default: disabled)
-#_FORCE="disabled"
-
-# $_QUIET: enable quiet
-# (Default: disabled)
-_QUIET="disabled"
-
-# $_VERBOSE: enable verbose
-# (Default: disabled)
-#_VERBOSE="disabled"
-
-# Internal stuff (FIXME)
-APT_OPTIONS="--yes"
-APTITUDE_OPTIONS="--assume-yes"
diff --git a/webconverger/config/source b/webconverger/config/source
deleted file mode 100644
index 1ac0ea6..0000000
--- a/webconverger/config/source
+++ /dev/null
@@ -1,9 +0,0 @@
-# config/source - options for live-helper(7), source stage
-
-# $LH_SOURCE: set source option
-# (Default: disabled)
-LH_SOURCE="disabled"
-
-# $LH_SOURCE_IMAGES: set image type
-# (Default: tar)
-LH_SOURCE_IMAGES="tar"

-- 
debian-live/config-webc



More information about the debian-live-changes mailing list