[SCM] debian-live/config-webc branch, master, updated. b6a8d6ac1d8a8226bd11b1254c8739b7f705d3d6
Kai Hendry
hendry at iki.fi
Sun Feb 1 21:51:05 UTC 2009
The following commit has been merged in the master branch:
commit 975c9d2c27fc82d21b8ed3494f7ec3e274ed3240
Author: Kai Hendry <hendry at iki.fi>
Date: Sun Feb 1 22:49:23 2009 +0100
webconverger/ also uses autoconfig
diff --git a/mini/config/binary_grub b/mini/config/binary_grub
deleted file mode 120000
index 8f9282a..0000000
--- a/mini/config/binary_grub
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_grub
\ No newline at end of file
diff --git a/webconverger/config/binary_grub/menu.lst b/mini/config/binary_grub/menu.lst
similarity index 100%
rename from webconverger/config/binary_grub/menu.lst
rename to mini/config/binary_grub/menu.lst
diff --git a/webconverger/config/binary_grub/splash.xpm.gz b/mini/config/binary_grub/splash.xpm.gz
similarity index 100%
copy from webconverger/config/binary_grub/splash.xpm.gz
copy to mini/config/binary_grub/splash.xpm.gz
diff --git a/mini/config/binary_local-hooks b/mini/config/binary_local-hooks
deleted file mode 120000
index 4e53010..0000000
--- a/mini/config/binary_local-hooks
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_local-hooks
\ No newline at end of file
diff --git a/webconverger/config/binary_local-hooks/01-remove-sbm.sh b/mini/config/binary_local-hooks/01-remove-sbm.sh
similarity index 100%
rename from webconverger/config/binary_local-hooks/01-remove-sbm.sh
rename to mini/config/binary_local-hooks/01-remove-sbm.sh
diff --git a/webconverger/config/binary_local-hooks/02-repack-initrd.sh b/mini/config/binary_local-hooks/02-repack-initrd.sh
similarity index 100%
rename from webconverger/config/binary_local-hooks/02-repack-initrd.sh
rename to mini/config/binary_local-hooks/02-repack-initrd.sh
diff --git a/webconverger/config/binary_local-hooks/03-remove-newt-installer.sh b/mini/config/binary_local-hooks/03-remove-newt-installer.sh
similarity index 100%
rename from webconverger/config/binary_local-hooks/03-remove-newt-installer.sh
rename to mini/config/binary_local-hooks/03-remove-newt-installer.sh
diff --git a/mini/config/chroot_local-hooks/minimal b/mini/config/chroot_local-hooks/minimal
index fb77c68..4a6f1b4 100755
--- a/mini/config/chroot_local-hooks/minimal
+++ b/mini/config/chroot_local-hooks/minimal
@@ -1,7 +1,7 @@
#!/bin/sh
# /usr/share/live-helper/hooks/minimal - hook list for live-helper(7)
-# Copyright (C) 2006-2008 Daniel Baumann <daniel at debian.org>
+# Copyright (C) 2006-2009 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
# This is free software, and you are welcome to redistribute it
@@ -10,7 +10,7 @@
set -e
# Removing unused packages
-for PACKAGE in aptitude man-db manpages info groff-base vim-tiny ed
+for PACKAGE in apt-utils aptitude man-db manpages info wget
do
if ! apt-get remove --purge --yes "${PACKAGE}"
then
@@ -25,14 +25,6 @@ find . -name *~ -print0 | xargs -0 rm -f
rm -rf /var/cache/man/*
-# Cleaning apt lists
-rm -rf /var/lib/apt/lists
-mkdir -p /var/lib/apt/lists/partial
-
-# Cleaning apt cache
-rm -rf /var/cache/apt
-mkdir -p /var/cache/apt/archives/partial
-
# Truncating logs
for FILE in $(find /var/log/ -type f)
do
diff --git a/mini/scripts/config b/mini/scripts/config
index 64a0413..d87fd22 100755
--- a/mini/scripts/config
+++ b/mini/scripts/config
@@ -15,6 +15,9 @@ lh_config noautoconfig \
--bootloader grub \
--categories "main contrib non-free" \
--distribution lenny \
+ --iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
+ --iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
+ --memtest none \
--mirror-bootstrap ${MIRROR_DEBIAN} \
--mirror-chroot ${MIRROR_DEBIAN} \
--mirror-chroot-security ${MIRROR_SECURITY} \
diff --git a/webconverger/Makefile b/webconverger/Makefile
new file mode 100644
index 0000000..2530ca5
--- /dev/null
+++ b/webconverger/Makefile
@@ -0,0 +1,11 @@
+build:
+ sudo ./scripts/build
+config/binary:
+ ./scripts/config
+clean:
+ sudo ./scripts/clean
+cleanbin:
+ sudo lh clean --binary
+source:
+ lh_config --source enabled
+ lh build
diff --git a/webconverger/config/binary b/webconverger/config/binary
index cf6d7ec..4e1b6b6 100644
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@ -2,142 +2,153 @@
# $LH_BINARY_FILESYSTEM: set image filesystem
# (Default: fat16)
-#LH_BINARY_FILESYSTEM="fat16"
+LH_BINARY_FILESYSTEM="fat16"
# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
+# (Default: usb-hdd)
+LH_BINARY_IMAGES="usb-hdd"
# $LH_BINARY_INDICES: set apt/aptitude generic indices
# (Default: enabled)
-#LH_BINARY_INDICES="enabled"
+LH_BINARY_INDICES="enabled"
# $LH_BOOTAPPEND_LIVE: set boot parameters
# (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com/ nosudo splash vga=791"
+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="auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet"
+LH_BOOTAPPEND_INSTALL="file=/hd-media/install//preseed.cfg -- ${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_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_CHROOT_BUILD="enabled"
# $LH_DEBIAN_INSTALLER: set debian-installer
# (Default: disabled)
-LH_DEBIAN_INSTALLER="live"
-LH_DEBIAN_INSTALLER_PRESEEDFILE="preseed.cfg"
+LH_DEBIAN_INSTALLER="disabled"
-# $LH_DEBIAN_INSTALLER_DAILY: set daily images
-# (Default: disabled)
-#LH_DEBIAN_INSTALLER_DAILY="enabled"
-
-# $LH_ENCRYPTION: set encrytion
+# $LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
# (Default: empty)
-#LH_ENCRYPTION=""
+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_GRUB_SPLASH=""
# $LH_HOSTNAME: set hostname
-# (Default: debian)
+# (Default: webconverger)
LH_HOSTNAME="webconverger"
# $LH_ISO_APPLICATION: set iso author
# (Default: Debian Live)
-LH_ISO_APPLICATION="Webconverger"
+LH_ISO_APPLICATION="Debian Live"
# $LH_ISO_PREPARER: set iso preparer
-# (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"
+# (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: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
+# (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: Debian Live $(date +%Y%m%d-%H:%M))
-LH_ISO_VOLUME="Webconverger $(date +%Y%m%d-%H:%M)"
+# (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: memtest86+)
-LH_MEMTEST="disabled"
+# (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_FILESYSTEM="nfs"
# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
# (Default: empty)
-#LH_NET_ROOT_MOUNTOPTIONS=""
+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_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_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_FILESYSTEM="nfs"
# $LH_NET_COW_MOUNTOPTIONS: set cow mount options
# (Default: empty)
-#LH_NET_COW_MOUNTOPTIONS=""
+LH_NET_COW_MOUNTOPTIONS=""
# $LH_NET_COW_PATH: set cow directory
# (Default: )
-#LH_NET_COW_PATH=""
+LH_NET_COW_PATH=""
# $LH_NET_COW_SERVER: set cow server
# (Default: )
-#LH_NET_COW_SERVER=""
+LH_NET_COW_SERVER=""
# $LH_NET_TARBALL: set net tarball
# (Default: gzip)
-#LH_NET_TARBALL="gzip"
+LH_NET_TARBALL="gzip"
# $LH_SYSLINUX_SPLASH: set custom syslinux splash
# (Default: empty)
-LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
+LH_SYSLINUX_SPLASH=""
# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
# (Default: 0)
-LH_SYSLINUX_TIMEOUT="10"
+LH_SYSLINUX_TIMEOUT="0"
# $LH_SYSLINUX_CFG: set custom syslinux configuration file
# (Default: empty)
-#LH_SYSLINUX_CFG=""
+LH_SYSLINUX_CFG=""
# $LH_SYSLINUX_MENU: set syslinux menu
# (Default: disabled)
-#LH_SYSLINUX_MENU="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_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_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_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
# $LH_USERNAME: set username
-# (Default: user)
+# (Default: webc)
LH_USERNAME="webc"
diff --git a/webconverger/config/bootstrap b/webconverger/config/bootstrap
index 2860484..9d739d4 100644
--- a/webconverger/config/bootstrap
+++ b/webconverger/config/bootstrap
@@ -1,24 +1,53 @@
+# 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 boostrap from
-# (Default: http://ftp.us.debian.org/debian/)
-LH_MIRROR_BOOTSTRAP="http://mirror.webconverger.com/debian"
+# $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://ftp.us.debian.org/debian/)
-LH_MIRROR_CHROOT="http://mirror.webconverger.com/debian"
+# (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://security.debian.org/)
-#LH_MIRROR_CHROOT_SECURITY="ftp://mirror.hetzner.de/debian/security"
+# (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://ftp.us.debian.org/debian/)
-#LH_MIRROR_BINARY="http://debian.virginmedia.com/"
+# (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://security.debian.org/)
-#LH_MIRROR_BINARY_SECURITY="http://ftp.de.debian.org/debian-security/"
+# (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
index fbba298..7d2f97a 100644
--- a/webconverger/config/chroot
+++ b/webconverger/config/chroot
@@ -2,7 +2,7 @@
# $LH_CHROOT_FILESYSTEM: set chroot filesystem
# (Default: squashfs)
-#LH_CHROOT_FILESYSTEM="plain"
+LH_CHROOT_FILESYSTEM="squashfs"
# $LH_UNION_FILESYSTEM: set union filesystem
# (Default: aufs)
@@ -10,23 +10,23 @@ LH_UNION_FILESYSTEM="aufs"
# $LH_EXPOSED_ROOT: expose root as read only
# (Default: disabled)
-#LH_EXPOSED_ROOT="disabled"
+LH_EXPOSED_ROOT="disabled"
# $LH_HOOKS: set hook commands
# (Default: empty)
-#LH_HOOKS=""
+LH_HOOKS=""
# $LH_INTERACTIVE: set interactive build
# (Default: disabled)
-#LH_INTERACTIVE="disabled"
+LH_INTERACTIVE="disabled"
# $LH_KEYRING_PACKAGES: set keyring packages
# (Default: empty)
-#LH_KEYRING_PACKAGES=""
+LH_KEYRING_PACKAGES="debian-archive-keyring"
# $LH_LANGUAGE: set language to use
# (Default: empty)
-#LH_LANGUAGE="en"
+LH_LANGUAGE="en"
# $LH_LINUX_FLAVOURS: set kernel flavour to use
# (Default: autodetected)
@@ -34,28 +34,28 @@ 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 lzma-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)
-#LH_PACKAGES=""
+LH_PACKAGES=""
# $LH_PACKAGES_LISTS: set package list to install
-# (Default: standard)
-LH_PACKAGES_LISTS="standard chinese iceweasel-l10n japanese korean myspell printing webconverger"
+# (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_TASKS=""
# $LH_SECURITY: enable security updates
# (Default: enabled)
-#LH_SECURITY="enabled"
+LH_SECURITY="enabled"
# $LH_SYMLINKS: enable symlink convertion
# (Default: disabled)
-#LH_SYMLINKS="disabled"
+LH_SYMLINKS="disabled"
# $LH_SYSVINIT: enable sysvinit
# (Default: disabled)
-#LH_SYSVINIT="disabled"
+LH_SYSVINIT="disabled"
diff --git a/webconverger/config/common b/webconverger/config/common
index b94e254..a4b384f 100644
--- a/webconverger/config/common
+++ b/webconverger/config/common
@@ -1,80 +1,80 @@
# config/common - common options for live-helper(7)
# $LH_APT: set package manager
-# (Default: aptitude)
-#LH_APT="aptitude"
+# (Default: apt)
+LH_APT="apt"
# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
# (Default: autodetected or empty)
-#LH_APT_FTP_PROXY=""
+LH_APT_FTP_PROXY=""
# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
# (Default: autodetected or empty)
-#LH_APT_HTTP_PROXY=""
+LH_APT_HTTP_PROXY=""
# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
# (Default: enabled)
-#LH_APT_PDIFFS="enabled"
+LH_APT_PDIFFS="enabled"
# $LH_APT_PIPELINE: set apt/aptitude pipeline depth
# (Default: )
-#LH_APT_PIPELINE=""
+LH_APT_PIPELINE=""
# $LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: enabled)
+# (Default: disabled)
LH_APT_RECOMMENDS="disabled"
# $LH_APT_SECURE: set apt/aptitude security
# (Default: enabled)
-LH_APT_SECURE="disabled"
+LH_APT_SECURE="enabled"
# $LH_BOOTSTRAP: set bootstrap program
# (Default: debootstrap)
-#LH_BOOTSTRAP="debootstrap"
+LH_BOOTSTRAP="debootstrap"
# $LH_CACHE: control cache
# (Default: enabled)
-#LH_CACHE="enabled"
+LH_CACHE="enabled"
# $LH_CACHE_INDICES: control if downloaded package indices should be cached
# (Default: disabled)
-#LH_CACHE_INDICES="disabled"
+LH_CACHE_INDICES="disabled"
# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
# (Default: enabled)
-#LH_CACHE_PACKAGES="enabled"
+LH_CACHE_PACKAGES="enabled"
# $LH_CACHE_STAGES: control if completed stages should be cached
# (Default: bootstrap)
-#LH_CACHE_STAGES="bootstrap"
+LH_CACHE_STAGES="bootstrap"
# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
# (Default: noninteractive)
-#LH_DEBCONF_FRONTEND="noninteractive"
+LH_DEBCONF_FRONTEND="noninteractive"
# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
# (Default: yes)
-#LH_DEBCONF_NOWARNINGS="yes"
+LH_DEBCONF_NOWARNINGS="yes"
# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
# (Default: critical)
-#LH_DEBCONF_PRIORITY="critical"
+LH_DEBCONF_PRIORITY="critical"
# $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_FDISK="fdisk"
# $LH_LOSETUP: set losetup program
# (Default: autodetected)
-#LH_LOSETUP="losetup"
+LH_LOSETUP="losetup"
# $LH_MODE: set distribution mode
# (Default: debian)
-#LH_MODE="debian"
+LH_MODE="debian"
# $LH_ROOT_COMMAND: use sudo or equivalent
# (Default: empty)
@@ -82,42 +82,46 @@ LH_INITRAMFS="live-initramfs"
# $LH_USE_FAKEROOT: use fakeroot/fakechroot
# (Default: disabled)
-#LH_USE_FAKEROOT="disabled"
+LH_USE_FAKEROOT="disabled"
# $LH_TASKSEL: set tasksel program
-# (Default: aptitude)
-#LH_TASKSEL="aptitude"
+# (Default: tasksel)
+LH_TASKSEL="tasksel"
# $LH_INCLUDES: set includes
# (Default: /usr/share/live-helper/includes)
-#LH_INCLUDES="/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"
+LH_TEMPLATES="/usr/share/live-helper/templates"
# Live-helper options
-# $LH_BREAKPOINTS: enable breakpoints
+# $_BREAKPOINTS: enable breakpoints
# (Default: disabled)
-# LH_BREAKPOINTS="enabled"
+#_BREAKPOINTS="disabled"
-# $LH_DEBUG: enable debug
+# $_DEBUG: enable debug
# (Default: disabled)
-#LH_DEBUG="enabled"
+#_DEBUG="disabled"
+
+# $_COLOR: enable color
+# (Default: false)
+#_COLOR="false"
-# $LH_FORCE: enable force
+# $_FORCE: enable force
# (Default: disabled)
-#LH_FORCE="disabled"
+#_FORCE="disabled"
-# $LH_QUIET: enable quiet
+# $_QUIET: enable quiet
# (Default: disabled)
-LH_QUIET="enabled"
+_QUIET="disabled"
-# $LH_VERBOSE: enable verbose
+# $_VERBOSE: enable verbose
# (Default: disabled)
-#LH_VERBOSE="disabled"
+#_VERBOSE="disabled"
# Internal stuff (FIXME)
-#APT_OPTIONS="--yes"
-#APTITUDE_OPTIONS="--assume-yes"
+APT_OPTIONS="--yes"
+APTITUDE_OPTIONS="--assume-yes"
diff --git a/webconverger/config/source b/webconverger/config/source
index b24fffc..1ac0ea6 100644
--- a/webconverger/config/source
+++ b/webconverger/config/source
@@ -2,8 +2,8 @@
# $LH_SOURCE: set source option
# (Default: disabled)
-#LH_SOURCE="enabled"
+LH_SOURCE="disabled"
# $LH_SOURCE_IMAGES: set image type
# (Default: tar)
-#LH_SOURCE_IMAGES="tar"
+LH_SOURCE_IMAGES="tar"
diff --git a/mini/scripts/build b/webconverger/scripts/build
similarity index 100%
copy from mini/scripts/build
copy to webconverger/scripts/build
diff --git a/mini/scripts/build.sh b/webconverger/scripts/build.sh
similarity index 100%
copy from mini/scripts/build.sh
copy to webconverger/scripts/build.sh
diff --git a/mini/scripts/clean b/webconverger/scripts/clean
similarity index 100%
copy from mini/scripts/clean
copy to webconverger/scripts/clean
diff --git a/mini/scripts/config b/webconverger/scripts/config
similarity index 68%
copy from mini/scripts/config
copy to webconverger/scripts/config
index 64a0413..b09314f 100755
--- a/mini/scripts/config
+++ b/webconverger/scripts/config
@@ -5,20 +5,22 @@ MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
lh_config noautoconfig \
--apt-recommends disabled \
- --debian-installer live \
- --debian-installer-distribution lenny \
+ --debian-installer disabled \
--bootappend-live "quiet homepage=http://portal.webconverger.com/ nonetworking nosudo splash vga=791" \
-k 486 \
-a i386 \
--username webc \
--hostname webconverger \
- --bootloader grub \
+ -b usb-hdd \
--categories "main contrib non-free" \
--distribution lenny \
+ --iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
+ --iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
+ --memtest none \
--mirror-bootstrap ${MIRROR_DEBIAN} \
--mirror-chroot ${MIRROR_DEBIAN} \
--mirror-chroot-security ${MIRROR_SECURITY} \
--mirror-binary ${MIRROR_DEBIAN} \
--mirror-binary-security ${MIRROR_SECURITY} \
- --packages-lists "webconverger" \
+ --packages-lists "chinese iceweasel-l10n japanese korean myspell printing webconverger" \
${@}
--
debian-live/config-webc
More information about the debian-live-changes
mailing list