[Debian-live-changes] r994 - dists/sid releases/live-helper releases/live-helper/1.0~a5-1 releases/live-helper/1.0~a5-1/doc releases/live-helper/1.0~a5-1/doc/examples releases/live-helper/1.0~a5-1/functions

Daniel Baumann daniel at alioth.debian.org
Mon Apr 9 17:03:40 UTC 2007


Author: daniel
Date: 2007-04-09 17:03:39 +0000 (Mon, 09 Apr 2007)
New Revision: 994

Added:
   releases/live-helper/1.0~a5-1/
   releases/live-helper/1.0~a5-1/doc/ChangeLog
   releases/live-helper/1.0~a5-1/doc/examples/live.sources.list
   releases/live-helper/1.0~a5-1/functions/defaults.sh
   releases/live-helper/1.0~a5-1/helpers/
Removed:
   dists/sid/live-helper/
   releases/live-helper/1.0~a5-1/doc/ChangeLog
   releases/live-helper/1.0~a5-1/functions/defaults.sh
   releases/live-helper/1.0~a5-1/helpers/
Log:


Copied: releases/live-helper/1.0~a5-1 (from rev 973, dists/trunk/live-helper)

Deleted: releases/live-helper/1.0~a5-1/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-07 14:28:37 UTC (rev 973)
+++ releases/live-helper/1.0~a5-1/doc/ChangeLog	2007-04-09 17:03:39 UTC (rev 994)
@@ -1,291 +0,0 @@
-2007-04-06  Daniel Baumann  <daniel at debian.org>
-
-	* functions/breakpoints.sh, helpers/*:
-	  - Added initial breakpoints.
-	* functions/chroot.sh:
-	  - Adding /usr/local to path.
-	* functions/lockfile.sh:
-	  - Added additional signals to the trap.
-	* helpers/lh_binary_includes:
-	  - Respect LIVE_INCLUDES=none.
-	* manpages/*:
-	  - Updated.
-
-2007-04-05  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, templates/grub/menu.lst:
-	  - Added splash functionality.
-	* Uploaded 1.0~a4-1.
-
-2007-04-03  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_grub, lh_binary_grub:
-	  - Added check for LIVE_TEMPLATES to be existing.
-	* helpers/lh_binary_includes:
-	  - Added check for LIVE_INCLUDES to be existing.
-
-2007-04-02  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*:
-	  - Merged LIVE_SYSLINUX and LIVE_GRUB into LIVE_BOOTLOADER.
-	* helpers/lh_binary_iso:
-	  - Added exclude for the bootloader from the iso image content.
-
-2007-04-01  Daniel Baumann  <daniel at debian.org>
-
-	* helper/lh_binary_grub:
-	  - Added.
-
-2007-03-30  Daniel Baumann  <daniel at debian.org>
-
-	* helper/lh_chroot_localincludes:
-	  - Fixed wrong path for hook removal.
-
-2007-03-29  Daniel Baumann  <daniel at debian.org>
-
-	* functions/common.sh, echo.sh:
-	  - Added.
-	* doc/README, helpers/lh_source, manpages/lh_binary.1, live-helper.7:
-	  - Added forgotten helpers.
-	* doc/FAQ:
-	  - Added.
-	* lists/mini, minimal:
-	  - Added --yes to apt call to make them non-interactive.
-	* manpages/lh_chroot.1:
-	  - Added.
-
-2007-03-28  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap:
-	  - Added --debug, --quiet, and --verbose.
-
-2007-03-27  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_linuximage, lh_binary_memtest86:
-	  - Added missing Read_conffiles to fix foreign architecture builds.
-
-2007-03-26  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_bootstrap_cdebootstrap, lh_bootstrap_debootstrap,
-	  lh_clean:
-	  - Added routine to cache bootstrapped chroot as suggested by Kai
-	    Hendry <hendry at iki.fi>.
-	* helpers/lh_chroot_rootfs:
-	  - Fixed typo in net type.
-	* lists/gnome*, kde*, standard-x11, xfce*:
-	  - Added menu.
-
-2007-03-26  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Fixed handling of desktop list variable loop.
-	* Uploaded 1.0~a3-1.
-
-2007-03-25  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*:
-	  - Renamed LIVE_FLAVOUR to LIVE_BOOTSTRAP_FLAVOUR.
-	  - Renamed LIVE_PACKAGES_LIST to LIVE_PACKAGES_LISTS.
-	* functions/cache.sh:
-	  - Added.
-	* helpers/lh_bootstrap_cdebootstrap:
-	  - Added removal of cdebootstrap-helper-diverts.
-	* helpers/lh_binary_chroot:
-	  - Added.
-	* helpers/lh_binary_rootfs:
-	  - Moved filesystem routines into chroot.
-	* helpers/lh_chroot_localization, lh_chroot_localpackages,
-	  lh_chroot_localpackageslists, lh_chroot_packages,
-	  lh_chroot_packageslists, lh_chroot_tasks:
-	  - Added check for LH_CACHE.
-	* helpers/lh_chroot_apt:
-	  - Removing old apt.conf if existing as suggested by Ben Armstrong
-	    <synrg at debian.org>.
-	* helpers/lh_chroot_hacks:
-	  - Added check for already installed smbfs.
-	  - Added check for already configured initramfs.conf as suggested by
-	    Ben Armstrong <synrg at debian.org>.
-	* helpers/lh_chroot_interactive:
-	  - Added.
-	* helpers/lh_chroot_tasks:
-	  - Added routine for LH_APT=apt.
-	* lists/minimal-net:
-	  - Minimized.
-
-2007-03-24  Daniel Baumann  <daniel at debian.org>
-
-	* functions/*, helpers/*, hooks/*:
-	  - Added GPL blurb.
-	* functions/arguments.sh, helpers/*:
-	  - Added common arguments.
-	* functions/arguments.sh, stagefile.sh, helpers/*,
-	  manpages/live-helper.7:
-	  - Added --force option.
-	* functions/defaults.sh, helpers/lh_binary_syslinux, lh_config,
-	  make-live:
-	  - Added LIVE_USERNAME and LIVE_HOSTNAME.
-	* helpers/lh_binary_linuximage, lh_binary_memtest86,
-	  lh_binary_syslinux:
-	  - Moved kernel directory to live.
-	* helpers/lh_clean:
-	  - Added purge.
-
-2007-03-23  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/make-live:
-	  - Calling Arguments twice to catch case with non-default root.
-
-2007-03-22  Daniel Baumann  <daniel at debian.org>
-
-	* functions/default.sh, helpers/*:
-	  - Renamed lh_chroot_packageslist to lh_chroot_packageslists and
-	    lh_chroot_localpackageslist to lh_chroot_localpackageslists
-	* helpers/lh_binary_includes:
-	  - Using LIVE_INCLUDES now.
-	* helpers/lh_chroot_apt:
-	  - Added LH_APT_SECURE.
-	* helpers/lh_chroot_linuximage:
-	  - Added check for LIVE_KERNEL_PACKGES=none to allow kernel packages as
-	    local packages.
-
-2007-03-21  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_hdd, lh_binary_iso, lh_binary_net, lh_binary_usb:
-	  - Checking earlier if there is something todo.
-	* helpers/lh_binary_linuximage, lh_binary_syslinux,
-	  lh_chroot_linuximage, templates/syslinux/isolinux.cfg:
-	  - Extended to support multiple kernels at once.
-	* helpers/lh_binary_includes, lh_binary_localincludes,
-	  lh_chroot_localincludes:
-	  - Replaced path with variable as suggested Kai Hendry <hendry at iki.fi>.
-	* helpers/lh_source_md5sum:
-	  - Added.
-	* helpers/make-live:
-	  - Added short options in ARGUMENTS.
-	* functions/defaults.sh, helpers/*:
-	  - Renamed LIVE_KERNEL to LIVE_KERNEL_FLAVOUR.
-	  - Renamed LIVE_MIRROR_LOCAL to LIVE_MIRROR_BUILD and
-	    LIVE_MIRROR_GENERIC to LIVE_MIRROR_IMAGE.
-
-2007-03-20  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/make-live:
-	  - Fixed typo in ARGUMENTS.
-
-2007-03-19  Daniel Baumann  <daniel at debian.org>
-
-	* lists/gnome*, kde*, standard-x11, xfce*:
-	  - Added alsa-base, alsa-oss, alsa-utils, and discover.
-
-2007-03-19  Daniel Baumann  <daniel at debian.org>
-
-	* Uploaded 1.0~a2-1.
-
-2007-03-18  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Quoted date call in LIVE_ISO_VOLUME.
-	* manpages/lh_clean.1:
-	  - Added.
-
-2007-03-17  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh, helpers/*:
-	  - Renamed LIVE_MIRROR to LIVE_MIRROR_LOCAL and LIVE_MIRROR_SECURITY
-	    to LIVE_MIRROR_LOCAL_SECURITY.
-	* doc/examples/beryl-hook.sh:
-	  - Added, submitted by Inigo Tejedor Arrondo <inigo at navarrux.org>.
-	* helpers/lh_config, make-live:
-	  - Added check for newconfig to prevent overwriting of non-specified
-	    options to default values.
-	* helpers/lh_chroot_localhooks:
-	  - Added basename where needed.
-	* helpers/lh_chroot_sources:
-	  - Added check for local sources.list in config for custom
-	    repositories.
-	  - Replaced security check for etch with check for not-unstable.
-	* manpages/lh_binary.1, lh_bootstrap.1, lh_bootstrap_cdebootstrap.1,
-	  lh_bootstrap_debootstrap.1, lh_testroot.1:
-	  - Added.
-	* templates/syslinux/pxlinux.cfg:
-	  - Fixed path.
-
-2007-03-16  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_binary_usb: Corrected stagefile creation.
-
-2007-03-15  Daniel Baumann  <daniel at debian.org>
-
-	* Makefile:
-	  - Replaced helper uninstall routine with a less intrusive one.
-	* doc/NEWS:
-	  - Updated.
-	* functions/conffile.sh:
-	  - Beautified.
-	* functions/defaults.sh:
-	  - Added LH_LOSETUP.
-	* functions/lockfile.sh:
-	  - Beautified.
-	* helpers/*:
-	  - Allowing apt-get, not just apt in LH_APT.
-	* helpers/lh_config:
-	  - Added check for existing configuration.
-	* helpers/lh_binary_md5sum:
-	  - Removed legacy code.
-	* helpers/lh_binary_manifest:
-	  - Added creation of packages.txt.
-	* helpers/lh_binary_usb, lh_source_usb:
-	  - Replaced loop device node workaround with a better one.
-	* helpers/lh_chroot_hooks, lh_chroot_localhooks:
-	  - Fixed executable check.
-	* helpers/lh_source_config:
-	  - Added.
-	* helpers/lh_source_download:
-	  - Separeted debian sources and debian-live configuration into
-	    different directories.
-	  - Added live-helper to the sources.
-	* helpers/lh_source_generic, lh_source_iso, lh_source_usb,
-	  lh_source_net:
-	  - Removed annyoing warning when sources are disabled.
-	* helpers/lh_source_net:
-	  - Beautified.
-	* helpers/make-live:
-	  - Fixed typo in ARGUMENTS.
-	  - Moved help, usage, version into functions.
-	  - Removed build pre-option.
-	* manpages/live-helper.7:
-	  - Added.
-	* templates/syslinux/f10.txt:
-	  - Added note about Debian Live project.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh, helpers/*:
-	  - Converted LIVE_ROOT to directory, not full path.
-	* functions/*, helpers/*:
-	  - Replaced LIVE_CHROOT with directory name.
-	* functions/conffile.sh:
-	  - Added warning if CONFFILE is not readable.
-	* helpers/lh_chroot_localization:
-	  - Completed check for koffice.
-	* helpers/lh_source_download:
-	  - Fixed typo in old source removal.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* helpers/lh_chroot_hacks:
-	  - Added removal of udev persistent-net rule.
-	* Uploaded 1.0~a1-3.
-
-2007-03-14  Daniel Baumann  <daniel at debian.org>
-
-	* functions/defaults.sh:
-	  - Fixed setting of LIVE_SYSVINIT.
-	* helpers/lh_chroot_sysvinit:
-	  - Changed check for LIVE_SYSVINIT from disabled to enabled.
-	* Uploaded 1.0~a1-2.
-
-2007-03-12  Daniel Baumann  <daniel at debian.org>
-
-	* Rewritten live-package.
-	* Uploaded 1.0~a1-1.

Copied: releases/live-helper/1.0~a5-1/doc/ChangeLog (from rev 993, dists/trunk/live-helper/doc/ChangeLog)

Copied: releases/live-helper/1.0~a5-1/doc/examples/live.sources.list (from rev 979, dists/trunk/live-helper/doc/examples/live.sources.list)

Deleted: releases/live-helper/1.0~a5-1/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-04-07 14:28:37 UTC (rev 973)
+++ releases/live-helper/1.0~a5-1/functions/defaults.sh	2007-04-09 17:03:39 UTC (rev 994)
@@ -1,430 +0,0 @@
-#!/bin/sh
-
-# defaults.sh - handle default values
-# Copyright (C) 2006-2007 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
-# under certain conditions; see COPYING for details.
-
-set -e
-
-Set_defaults ()
-{
-	## config/common
-
-	# Setting package manager
-	if [ -z "${LH_APT}" ]
-	then
-		LH_APT="aptitude"
-	fi
-
-	# Setting apt ftp proxy
-	if [ -z "${LH_APT_FTPPROXY}" ] && [ -n "${ftp_proxy}" ]
-	then
-		LH_APT_FTPPROXY="${ftp_proxy}"
-	else
-		if [ -n "${LH_APT_FTPPROXY}" ] && [ "${LH_APT_FTPRPOXY}" != "${ftp_proxy}" ]
-		then
-			ftp_proxy="${LH_APT_FTPRPOXY}"
-		fi
-	fi
-
-	# Setting apt http proxy
-	if [ -z "${LH_APT_HTTPPROXY}" ] && [ -n "${http_proxy}" ]
-	then
-		LH_APT_HTTPPROXY="${http_proxy}"
-	else
-		if [ -n "${LH_APT_HTTPPROXY}" ] && [ "${LH_APT_HTTPRPOXY}" != "${http_proxy}" ]
-		then
-			http_proxy="${LH_APT_HTTPPROXY}"
-		fi
-	fi
-
-	# Setting apt indices
-	if [ -z "${LH_APT_GENERIC}" ]
-	then
-		LH_APT_GENERIC="enabled"
-	fi
-
-	# Setting apt pdiffs
-	if [ -z "${LH_APT_PDIFFS}" ]
-	then
-		LH_APT_PDIFFS="enabled"
-	fi
-
-	# Setting apt recommends
-	if [ -z "${LH_APT_RECOMMENDS}" ]
-	then
-		LH_APT_RECOMMENDS="enabled"
-	fi
-
-	# Setting apt secure
-	if [ -z "${LH_APT_SECURE}" ]
-	then
-		LH_APT_SECURE="enabled"
-	fi
-
-	# Setting bootstrap program
-	if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ]
-	then
-		if [ -x "/usr/bin/cdebootstrap" ]
-		then
-			LH_BOOTSTRAP="cdebootstrap"
-		elif [ -x "/usr/sbin/debootstrap" ]
-		then
-			LH_BOOTSTRAP="debootstrap"
-		else
-			echo "E: Can't process file /usr/bin/cdebootstrap or /usr/sbin/debootstrap (FIXME)"
-			exit 1
-		fi
-	fi
-
-	# Setting cache option
-	if [ -z "${LH_CACHE}" ]
-	then
-		LH_CACHE="enabled"
-	fi
-
-	# Setting debconf frontend
-	if [ -z "${LH_DEBCONF_FRONTEND}" ]
-	then
-		LH_DEBCONF_FRONTEND="noninteractive"
-	fi
-
-	if [ -z "${LH_DEBCONF_PRIORITY}" ]
-	then
-		LH_DEBCONF_PRIORITY="critical"
-	fi
-
-	# Setting genisoimage
-	if [ -z "${LH_GENISOIMAGE}" ]
-	then
-		LH_GENISOIMAGE="genisoimage"
-	fi
-
-	# Setting losetup
-	if [ -z "${LH_LOSETUP}" ] || [ ! -x "${LH_LOSETUP}" ]
-	then
-		# Check for loop-aes-utils divertion
-		if [ -x /sbin/losetup.orig ]
-		then
-			LH_LOSETUP="losetup.orig"
-		elif [ -x /sbin/losetup ]
-		then
-			LH_LOSETUP="losetup"
-		else
-			echo "E: Can't process file /sbin/losetup (FIXME)"
-		fi
-	fi
-
-	# Setting root directory
-	if [ -z "${LIVE_ROOT}" ]
-	then
-		LIVE_ROOT="debian-live"
-	fi
-
-	# Setting live helper options
-	if [ -z "${LH_BREAKPOINTS}" ]
-	then
-		LH_BREAKPOINTS="disabled"
-	fi
-
-	if [ -z "${LH_DEBUG}" ]
-	then
-		LH_DEBUG="disabled"
-	fi
-
-	if [ -z "${LH_FORCE}" ]
-	then
-		LH_FORCE="disabled"
-	fi
-
-	if [ -z "${LH_QUIET}" ]
-	then
-		LH_QUIET="disabled"
-	fi
-
-	if [ -z "${LH_VERBOSE}" ]
-	then
-		LH_VERBOSE="disabled"
-	fi
-
-	## config/bootstrap
-
-	# Setting architecture value
-	if [ -z "${LIVE_ARCHITECTURE}" ]
-	then
-		if [ -x "/usr/bin/dpkg" ]
-		then
-			LIVE_ARCHITECTURE="`dpkg --print-architecture`"
-		else
-			echo "E: Can't process file /usr/bin/dpkg (FIXME)"
-		fi
-	fi
-
-	# Setting distribution value
-	if [ -z "${LIVE_DISTRIBUTION}" ]
-	then
-		LIVE_DISTRIBUTION="sid"
-	fi
-
-	# Setting distribution configuration value
-	# LIVE_BOOTSTRAP_CONFIG
-
-	# Setting flavour value
-	if [ -z "${LIVE_BOOTSTRAP_FLAVOUR}" ]
-	then
-			LIVE_BOOTSTRAP_FLAVOUR="standard"
-	fi
-
-	# Setting mirror to fetch packages from
-	if [ -z "${LIVE_MIRROR_BUILD}" ]
-	then
-		LIVE_MIRROR_BUILD="http://ftp.debian.org/debian/"
-	fi
-
-	# Setting security mirror to fetch packages from
-	if [ -z "${LIVE_MIRROR_BUILD_SECURITY}" ]
-	then
-		LIVE_MIRROR_BUILD_SECURITY="http://security.debian.org/"
-	fi
-
-	# Setting mirror which ends up in the image
-	if [ -z "${LIVE_MIRROR_IMAGE}" ]
-	then
-		LIVE_MIRROR_IMAGE="http://ftp.debian.org/debian/"
-	fi
-
-	# Setting security mirror which ends up in the image
-	if [ -z "${LIVE_MIRROR_IMAGE_SECURITY}" ]
-	then
-		LIVE_MIRROR_IMAGE_SECURITY="http://security.debian.org/"
-	fi
-
-	# Setting sections value
-	if [ -z "${LIVE_SECTIONS}" ]
-	then
-		LIVE_SECTIONS="main"
-	fi
-
-	## config/chroot
-
-	# Setting interactive shell/X11/Xnest
-	if [ -z "${LIVE_INTERACTIVE}" ]
-	then
-		LIVE_INTERACTIVE="disabled"
-	fi
-
-	# Setting kernel flavour string
-	if [ -z "${LIVE_KERNEL_FLAVOUR}" ]
-	then
-		case "${LIVE_ARCHITECTURE}" in
-			alpha)
-				LIVE_KERNEL_FLAVOUR="alpha-generic"
-				;;
-
-			amd64)
-				LIVE_KERNEL_FLAVOUR="amd64"
-				;;
-
-			arm)
-				echo "E: You need to specify the linux kernel flavour manually on arm (FIXME)."
-				exit 1
-				;;
-
-			hppa)
-				LIVE_KERNEL_FLAVOUR="parisc"
-				;;
-
-			i386)
-				LIVE_KERNEL_FLAVOUR="486"
-				;;
-
-			ia64)
-				LIVE_KERNEL_FLAVOUR="itanium"
-				;;
-
-			m68k)
-				LIVE_KERNEL_FLAVOUR="E: You need to specify the linux kernel flavour manually on m68k."
-				exit 1
-				;;
-
-			powerpc)
-				LIVE_KERNEL_FLAVOUR="powerpc"
-				;;
-
-			s390)
-				LIVE_KERNEL_FLAVOUR="s390"
-				;;
-
-			sparc)
-				LIVE_KERNEL_FLAVOUR="sparc32"
-				;;
-
-			*)
-				echo "E: Architecture notyet supported (FIXME)"
-				;;
-		esac
-	fi
-
-	# Set kernel packages
-	if [ -z "${LIVE_KERNEL_PACKAGES}" ]
-	then
-		LIVE_KERNEL_PACKAGES="linux-image-2.6 squashfs-modules-2.6 unionfs-modules-2.6"
-
-		if [ -n "${LIVE_ENCRYPTION}" ]
-		then
-			LIVE_KERNEL_PACKAGES="${LIVE_KERNEL_PACKAGES} loop-aes-modules-2.6"
-		fi
-	fi
-
-	# Setting language string
-	# LIVE_LANGUAGE
-
-	# Setting tasks
-	# LIVE_TASKS
-
-	# Setting packages string
-	# LIVE_PACKAGES
-
-	# Setting packages list string
-	if [ -z "${LIVE_PACKAGES_LISTS}" ]
-	then
-		LIVE_PACKAGES_LISTS="standard"
-	fi
-
-	# Setting tasks string
-	for LIST in ${LIVE_PACKAGES_LISTS}
-	do
-		case "${LIST}" in
-			gnome-desktop)
-				LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/gnome-desktop//'` standard-x11"
-				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/gnome-desktop//' -e 's/desktop//'` standard laptop desktop gnome-desktop"
-				;;
-
-			kde-desktop)
-				LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/kde-desktop//'` standard-x11"
-				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/kde-desktop//' -e 's/desktop//'` standard laptop desktop kde-desktop"
-				;;
-
-			xfce-desktop)
-				LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/xfce-desktop//'` standard-x11"
-				LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/standard//' -e 's/laptop//' -e 's/xfce-desktop//' -e 's/desktop//'` standard laptop desktop xfce-desktop"
-				;;
-		esac
-	done
-
-	LIVE_PACKAGES_LISTS="`echo ${LIVE_PACKAGES_LISTS} | sed -e 's/  //g'`"
-	LIVE_TASKS="`echo ${LIVE_TASKS} | sed -e 's/  //g'`"
-
-	# Setting security updates option
-	if [ -z "${LIVE_SECURITY}" ]
-	then
-		LIVE_SECURITY="enabled"
-	fi
-
-	# Setting symlink convertion option
-	if [ -z "${LIVE_SYMLINKS}" ]
-	then
-		LIVE_SYMLINKS="disabled"
-	fi
-
-	# Setting sysvinit option
-	if [ -z "${LIVE_SYSVINIT}" ]
-	then
-		LIVE_SYSVINIT="disabled"
-	fi
-
-	## config/image
-
-	# Setting boot parameters
-	# LIVE_BOOTAPPEND
-
-	# Setting encryption
-	# LIVE_ENCRYPTION
-
-	# Setting username
-	if [ -z "${LIVE_USERNAME}" ]
-	then
-		LIVE_USERNAME="user"
-	fi
-
-	# Setting hostname
-	if [ -z "${LIVE_HOSTNAME}" ]
-	then
-		LIVE_HOSTNAME="debian"
-	fi
-
-	# Setting image type
-	if [ -z "${LIVE_BINARY_IMAGE}" ]
-	then
-		LIVE_BINARY_IMAGE="iso"
-	fi
-
-	# Setting image type
-	if [ -z "${LIVE_SOURCE_IMAGE}" ]
-	then
-		LIVE_SOURCE_IMAGE="generic"
-	fi
-
-	# Setting filesystem
-	if [ -z "${LIVE_FILESYSTEM}" ]
-	then
-		LIVE_FILESYSTEM="squashfs"
-	fi
-
-	# Setting memtest86 option
-	if [ -z "${LIVE_MEMTEST86}" ]
-	then
-		LIVE_MEMTEST86="enabled"
-	fi
-
-	# Setting iso volume
-	if [ -z "${LIVE_ISO_VOLUME}" ]
-	then
-		LIVE_ISO_VOLUME="Debian Live \`date +%Y%m%d\`"
-	fi
-
-	# Setting netboot server address
-	if [ -z "${LIVE_SERVER_ADDRESS}" ]
-	then
-		LIVE_SERVER_ADDRESS="192.168.1.1"
-	fi
-
-	# Setting netboot server path
-	if [ -z "${LIVE_SERVER_PATH}" ]
-	then
-		LIVE_SERVER_PATH="/srv/debian-live"
-	fi
-
-	# Setting source option
-	if [ -z "${LIVE_SOURCE}" ]
-	then
-		LIVE_SOURCE="disabled"
-	fi
-
-	# Setting grub
-	if [ -z "${LIVE_BOOTLOADER}" ]
-	then
-		LIVE_BOOTLOADER="syslinux"
-	fi
-
-	# Setting grub splash
-	# LIVE_GRUB_SPLASH
-
-	# Setting syslinux splash
-	# LIVE_SYSLINUX_SPLASH
-
-	# Setting includes
-	if [ -z "${LIVE_INCLUDES}" ]
-	then
-		LIVE_INCLUDES="/usr/share/live-helper/includes"
-	fi
-
-	# Setting templates
-	if [ -z "${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="/usr/share/live-helper/templates"
-	fi
-}

Copied: releases/live-helper/1.0~a5-1/functions/defaults.sh (from rev 992, dists/trunk/live-helper/functions/defaults.sh)

Copied: releases/live-helper/1.0~a5-1/helpers (from rev 993, dists/trunk/live-helper/helpers)




More information about the Debian-live-changes mailing list