[Debian-live-changes] r1509 - in dists/trunk/live-helper: docs functions helpers manpages
daniel at alioth.debian.org
daniel at alioth.debian.org
Wed May 16 13:27:07 UTC 2007
Author: daniel
Date: 2007-05-16 13:27:07 +0000 (Wed, 16 May 2007)
New Revision: 1509
Added:
dists/trunk/live-helper/helpers/lh_binary_local-includes
dists/trunk/live-helper/helpers/lh_chroot_local-hooks
dists/trunk/live-helper/helpers/lh_chroot_local-includes
dists/trunk/live-helper/helpers/lh_chroot_local-packages
dists/trunk/live-helper/helpers/lh_chroot_local-packageslists
dists/trunk/live-helper/helpers/lh_source_debian
dists/trunk/live-helper/helpers/lh_source_debian-live
Removed:
dists/trunk/live-helper/helpers/lh_binary_localincludes
dists/trunk/live-helper/helpers/lh_chroot_localhooks
dists/trunk/live-helper/helpers/lh_chroot_localincludes
dists/trunk/live-helper/helpers/lh_chroot_localpackages
dists/trunk/live-helper/helpers/lh_chroot_localpackageslists
dists/trunk/live-helper/helpers/lh_source_config
dists/trunk/live-helper/helpers/lh_source_download
Modified:
dists/trunk/live-helper/docs/BUGS
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/docs/README
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_binary
dists/trunk/live-helper/helpers/lh_chroot
dists/trunk/live-helper/helpers/lh_chroot_sources
dists/trunk/live-helper/helpers/lh_config
dists/trunk/live-helper/helpers/lh_source
dists/trunk/live-helper/helpers/lh_source_generic
dists/trunk/live-helper/helpers/lh_source_hdd
dists/trunk/live-helper/helpers/lh_source_iso
dists/trunk/live-helper/helpers/lh_source_md5sum
dists/trunk/live-helper/helpers/lh_source_net
dists/trunk/live-helper/helpers/lh_source_usb-hdd
dists/trunk/live-helper/manpages/lh_binary.de.1
dists/trunk/live-helper/manpages/lh_binary.en.1
dists/trunk/live-helper/manpages/lh_chroot.de.1
dists/trunk/live-helper/manpages/lh_chroot.en.1
dists/trunk/live-helper/manpages/lh_source.de.1
dists/trunk/live-helper/manpages/lh_source.en.1
dists/trunk/live-helper/manpages/live-helper.de.7
dists/trunk/live-helper/manpages/live-helper.en.7
Log:
Modified: dists/trunk/live-helper/docs/BUGS
===================================================================
--- dists/trunk/live-helper/docs/BUGS 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/docs/BUGS 2007-05-16 13:27:07 UTC (rev 1509)
@@ -45,7 +45,7 @@
2. Where to send the bug report?
--------------------------------
-Report error logs of build time errors to live-package and run time errors to
+Report error logs of build time errors to live-helper and run time errors to
casper in the Debian Bug Tracking System. If you are unsure or need more help
before submitting a bug report, you can always send a message to
<debian-devel-live at lists.alioth.debian.org>. We will help you to figure it out.
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-05-16 13:27:07 UTC (rev 1509)
@@ -2,6 +2,15 @@
* helpers/*:
- Added check for local includes and templates.
+ - Renamed LH_APT_GENERIC to LH_BINARY_INDICES.
+ - Renamed lh_binary_localincludes to lh_binary_local-includes.
+ - Renamed lh_chroot_localhooks to lh_chroot_local-hooks.
+ - Renamed lh_chroot_localincludes to lh_chroot_local-includes.
+ - Renamed lh_chroot_localpackages to lh_chroot_local-packages.
+ - Renamed lh_chroot_localpackageslists to
+ lh_chroot_local-packageslists.
+ - Renamed lh_source_download to lh_source_debian.
+ - Renamed lh_source_config to lh_source_debian-live.
2007-05-09 Daniel Baumann <daniel at debian.org>
Modified: dists/trunk/live-helper/docs/README
===================================================================
--- dists/trunk/live-helper/docs/README 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/docs/README 2007-05-16 13:27:07 UTC (rev 1509)
@@ -22,7 +22,7 @@
|_ lh_chroot_localpackageslists
|_ lh_chroot_localization
|_ lh_chroot_hacks
- |_ lh_chroot_localincludes
+ |_ lh_chroot_local-includes
|_ lh_chroot_sysvinit
|_ lh_chroot_hooks
|_ lh_chroot_localhooks
@@ -57,7 +57,7 @@
|_ lh_binary_grub
|_ lh_binary_syslinux
|_ lh_binary_includes
- |_ lh_binary_localincludes
+ |_ lh_binary_local-includes
|_ lh_binary_md5sum
|
|_ lh_binary_hdd
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-05-16 13:27:07 UTC (rev 1509)
@@ -61,9 +61,9 @@
fi
# Setting apt indices
- if [ -z "${LH_APT_GENERIC}" ]
+ if [ -z "${LH_BINARY_INDICES}" ]
then
- LH_APT_GENERIC="enabled"
+ LH_BINARY_INDICES="enabled"
fi
# Setting apt pdiffs
Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_binary 2007-05-16 13:27:07 UTC (rev 1509)
@@ -48,7 +48,7 @@
lh_binary_syslinux ${*}
lh_binary_yaboot ${*}
lh_binary_includes ${*}
-lh_binary_localincludes ${*}
+lh_binary_local-includes ${*}
lh_binary_md5sum ${*}
# Building images
Copied: dists/trunk/live-helper/helpers/lh_binary_local-includes (from rev 1498, dists/trunk/live-helper/helpers/lh_binary_localincludes)
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_local-includes (rev 0)
+++ dists/trunk/live-helper/helpers/lh_binary_local-includes 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_binary_local-includes(1) - copy files into binary
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="copy files into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "binary_local-includes: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/binary_local-includes/* &> /dev/null
+then
+ # Copying includes
+ cd config/binary_local-includes
+ find . | cpio -dmpu "${OLDPWD}"/binary
+ cd "${OLDPWD}"
+
+ # Removing symlinks
+ if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+ then
+ find binary -type l | xargs rm -f
+ fi
+
+ # Creating stage file
+ Create_stagefile .stage/binary_local-includes
+fi
Deleted: dists/trunk/live-helper/helpers/lh_binary_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_localincludes 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_binary_localincludes 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# lh_binary_localincludes(1) - copy files into binary
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="copy files into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "binary_localincludes: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_localincludes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/binary_localincludes/* &> /dev/null
-then
- # Copying includes
- cd config/binary_localincludes
- find . | cpio -dmpu "${OLDPWD}"/binary
- cd "${OLDPWD}"
-
- # Removing symlinks
- if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
- then
- find binary -type l | xargs rm -f
- fi
-
- # Creating stage file
- Create_stagefile .stage/binary_localincludes
-fi
Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_chroot 2007-05-16 13:27:07 UTC (rev 1509)
@@ -49,13 +49,13 @@
lh_chroot_tasks ${*}
lh_chroot_packageslists ${*}
lh_chroot_packages ${*}
-lh_chroot_localpackages ${*}
-lh_chroot_localpackageslists ${*}
+lh_chroot_local-packages ${*}
+lh_chroot_local-packageslists ${*}
lh_chroot_localization ${*}
-lh_chroot_localincludes ${*}
+lh_chroot_local-includes ${*}
lh_chroot_sysvinit ${*}
lh_chroot_hooks ${*}
-lh_chroot_localhooks ${*}
+lh_chroot_local-hooks ${*}
lh_chroot_symlinks ${*}
lh_chroot_hacks ${*}
lh_chroot_interactive ${*}
Copied: dists/trunk/live-helper/helpers/lh_chroot_local-hooks (from rev 1498, dists/trunk/live-helper/helpers/lh_chroot_localhooks)
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-hooks (rev 0)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-hooks 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# lh_chroot_local-hooks(1) - execute local hooks in chroot
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="execute local hooks in chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "chroot_local-hooks: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing local-hooks
+if ls config/chroot_local-hooks/* &> /dev/null
+then
+ for HOOK in config/chroot_local-hooks/*
+ do
+ # Copying hook
+ cp "${HOOK}" chroot/root
+
+ # Making hook executable
+ if [ ! -x chroot/root/"`basename ${HOOK}`" ]
+ then
+ chmod +x chroot/root/"`basename ${HOOK}`"
+ fi
+
+ # Executing hook
+ Chroot "/root/`basename ${HOOK}`"
+
+ # Removing hook
+ rm -f chroot/root/"`basename ${HOOK}`"
+ done
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-hooks
+fi
Copied: dists/trunk/live-helper/helpers/lh_chroot_local-includes (from rev 1498, dists/trunk/live-helper/helpers/lh_chroot_localincludes)
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-includes (rev 0)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-includes 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# lh_chroot_local-includes(1) - copy local files into chroot
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="copy local files into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "chroot_local-includes: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-includes/* &> /dev/null
+then
+ # Copying includes
+ cd config/chroot_local-includes
+ find . | cpio -dmpu "${OLDPWD}"/chroot
+ cd "${OLDPWD}"
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-includes
+fi
Copied: dists/trunk/live-helper/helpers/lh_chroot_local-packages (from rev 1498, dists/trunk/live-helper/helpers/lh_chroot_localpackages)
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packages (rev 0)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packages 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# lh_chroot_local-packages(1) - install local packages into chroot
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install local packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "chroot_local-packages: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packages/*.deb &> /dev/null
+then
+ # Restoring cache
+ Restore_cache cache/packages_local-packages
+
+ # Copying packages
+ cp config/chroot_local-packages/*.deb chroot/root
+
+ # Installing packages
+ Chroot "find /root -name *.deb" > chroot/root/local-packages
+ Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
+
+ # Cleaning dependencies
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "apt-get install -f --yes"
+ ;;
+
+ aptitude)
+ Chroot "aptitude install -f --assume-yes"
+ ;;
+ esac
+
+ # Removing package files
+ rm -f chroot/root/*.deb
+ rm -f chroot/root/local-packages
+
+ # Saving cache
+ Save_cache cache/packages_local-packages
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-packages
+fi
Copied: dists/trunk/live-helper/helpers/lh_chroot_local-packageslists (from rev 1498, dists/trunk/live-helper/helpers/lh_chroot_localpackageslists)
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_local-packageslists (rev 0)
+++ dists/trunk/live-helper/helpers/lh_chroot_local-packageslists 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# lh_chroot_local-packageslists(1) - install local packages lists into chroot
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install local packages into chroot"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "chroot_local-packageslists: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packageslists/* &> /dev/null
+then
+ # Restoring cache
+ Restore_cache cache/packages_local-packageslists
+
+ for PACKAGESLIST in config/chroot_local-packageslists/*
+ do
+ # Copying package list
+ grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
+
+ # Installing package list
+ case "${LH_APT}" in
+ apt|apt-get)
+ Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes"
+ ;;
+
+ aptitude)
+ Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes"
+ ;;
+ esac
+
+ # Removing package list
+ rm -f chroot/root/"`basename ${PACKAGESLIST}`"
+ done
+
+ # Saving cache
+ Save_cache cache/packages_local-packageslists
+
+ # Creating stage file
+ Create_stagefile .stage/chroot_local-packageslists
+fi
Deleted: dists/trunk/live-helper/helpers/lh_chroot_localhooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localhooks 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_chroot_localhooks 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localhooks(1) - execute local hooks in chroot
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="execute local hooks in chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "chroot_localhooks: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localhooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing localhooks
-if ls config/chroot_localhooks/* &> /dev/null
-then
- for HOOK in config/chroot_localhooks/*
- do
- # Copying hook
- cp "${HOOK}" chroot/root
-
- # Making hook executable
- if [ ! -x chroot/root/"`basename ${HOOK}`" ]
- then
- chmod +x chroot/root/"`basename ${HOOK}`"
- fi
-
- # Executing hook
- Chroot "/root/`basename ${HOOK}`"
-
- # Removing hook
- rm -f chroot/root/"`basename ${HOOK}`"
- done
-
- # Creating stage file
- Create_stagefile .stage/chroot_localhooks
-fi
Deleted: dists/trunk/live-helper/helpers/lh_chroot_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localincludes 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_chroot_localincludes 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localincludes(1) - copy local files into chroot
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="copy local files into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "chroot_localincludes: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localincludes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_localincludes/* &> /dev/null
-then
- # Copying includes
- cd config/chroot_localincludes
- find . | cpio -dmpu "${OLDPWD}"/chroot
- cd "${OLDPWD}"
-
- # Creating stage file
- Create_stagefile .stage/chroot_localincludes
-fi
Deleted: dists/trunk/live-helper/helpers/lh_chroot_localpackages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localpackages 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_chroot_localpackages 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localpackages(1) - install local packages into chroot
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install local packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "chroot_localpackages: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localpackages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_localpackages/*.deb &> /dev/null
-then
- # Restoring cache
- Restore_cache cache/packages_localpackages
-
- # Copying packages
- cp config/chroot_localpackages/*.deb chroot/root
-
- # Installing packages
- Chroot "find /root -name *.deb" > chroot/root/localpackages
- Chroot "xargs --arg-file=/root/localpackages dpkg -i" || true
-
- # Cleaning dependencies
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install -f --yes"
- ;;
-
- aptitude)
- Chroot "aptitude install -f --assume-yes"
- ;;
- esac
-
- # Removing package files
- rm -f chroot/root/*.deb
- rm -f chroot/root/localpackages
-
- # Saving cache
- Save_cache cache/packages_localpackages
-
- # Creating stage file
- Create_stagefile .stage/chroot_localpackages
-fi
Deleted: dists/trunk/live-helper/helpers/lh_chroot_localpackageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localpackageslists 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_chroot_localpackageslists 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localpackageslists(1) - install local packages lists into chroot
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install local packages into chroot"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "chroot_localpackageslists: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localpackageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_localpackageslists/* &> /dev/null
-then
- # Restoring cache
- Restore_cache cache/packages_localpackageslists
-
- for PACKAGESLIST in config/chroot_localpackageslists/*
- do
- # Copying package list
- grep -v "^#" "${PACKAGESLIST}" > chroot/root/"`basename ${PACKAGESLIST}`"
-
- # Installing package list
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` apt-get install --yes"
- ;;
-
- aptitude)
- Chroot "xargs --arg-file=/root/`basename ${PACKAGESLIST}` aptitude install --assume-yes"
- ;;
- esac
-
- # Removing package list
- rm -f chroot/root/"`basename ${PACKAGESLIST}`"
- done
-
- # Saving cache
- Save_cache cache/packages_localpackageslists
-
- # Creating stage file
- Create_stagefile .stage/chroot_localpackageslists
-fi
Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources 2007-05-16 13:27:07 UTC (rev 1509)
@@ -212,7 +212,7 @@
Create_lockfile .lock
# Configure generic indices
- if [ "${LH_APT_GENERIC}" = "enabled" ]
+ if [ "${LH_BINARY_INDICES}" = "enabled" ]
then
# Don't do anything if it's not required
if [ "${LIVE_MIRROR_BOOTSTRAP}" = "${LIVE_MIRROR_BINARY}" ] && \
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_config 2007-05-16 13:27:07 UTC (rev 1509)
@@ -80,9 +80,9 @@
# (Default: autodetected or empty)
LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}"
-# \$LH_APT_GENERIC: set apt/aptitude generic indices
-# (Default: ${LH_APT_GENERIC})
-LH_APT_GENERIC="${LH_APT_GENERIC}"
+# \$LH_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LH_BINARY_INDICES})
+LH_BINARY_INDICES="${LH_BINARY_INDICES}"
# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
# (Default: ${LH_APT_PDIFFS})
@@ -183,6 +183,10 @@
cat > "${LIVE_ROOT}"/config/chroot << EOF
# config/chroot: configuration for lh_chroot_*
+# \$LIVE_INTERACTIVE: set interactive build
+# (Default: ${LIVE_INTERACTIVE})
+LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
+
# \$LIVE_KERNEL_FLAVOUR: set the kernel flavour to use
# (Default: autodetected)
LIVE_KERNEL_FLAVOUR="${LIVE_KERNEL_FLAVOUR}"
@@ -226,17 +230,13 @@
# \$LIVE_SYSVINIT: enable sysvinit
# (Default: ${LIVE_SYSVINIT})
LIVE_SYSVINIT="${LIVE_SYSVINIT}"
-
-# \$LIVE_INTERACTIVE: set interactive build
-# (Default: ${LIVE_INTERACTIVE})
-LIVE_INTERACTIVE="${LIVE_INTERACTIVE}"
EOF
# Creating lh_chroot_* directories
-mkdir -p "${LIVE_ROOT}"/config/chroot_localhooks
-mkdir -p "${LIVE_ROOT}"/config/chroot_localincludes
-mkdir -p "${LIVE_ROOT}"/config/chroot_localpackages
-mkdir -p "${LIVE_ROOT}"/config/chroot_localpackageslists
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages
+mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists
mkdir -p "${LIVE_ROOT}"/config/chroot_sources
# Creating lh_bootstrap_* configuration
@@ -356,5 +356,5 @@
# Creating lh_binary_* directories
mkdir -p "${LIVE_ROOT}"/config/binary_grub
-mkdir -p "${LIVE_ROOT}"/config/binary_localincludes
+mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
mkdir -p "${LIVE_ROOT}"/config/binary_syslinux
Modified: dists/trunk/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source 2007-05-16 13:27:07 UTC (rev 1509)
@@ -40,8 +40,8 @@
lh_chroot_sources install ${*}
# Preparing images
-lh_source_config ${*}
-lh_source_download ${*}
+lh_source_debian-live ${*}
+lh_source_debian ${*}
lh_source_md5sum ${*}
# Building images
Deleted: dists/trunk/live-helper/helpers/lh_source_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_config 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_config 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# lh_source_config(1) - copy debian-live config into source
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="copy debian-live config into source"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "source_config: Init"
-
-if [ "${LIVE_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_config
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian-live ]
-then
- rm -rf source/debian-live
-fi
-
-# Copy system configuration
-mkdir -p source/debian-live
-cp -a config source/debian-live
-
-# Create tarball
-cd source
-tar -cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
-cd "${OLDPWD}"
-
-rm -rf source/debian-live/config
-mv source/debian-live-config_*.tar.gz source/debian-live
-
-# Creating stage file
-Create_stagefile .stage/source_config
Copied: dists/trunk/live-helper/helpers/lh_source_debian (from rev 1498, dists/trunk/live-helper/helpers/lh_source_download)
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian (rev 0)
+++ dists/trunk/live-helper/helpers/lh_source_debian 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_source_debian(1) - download sources
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="debian sources"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "source_debian: Init"
+
+if [ "${LIVE_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian ]
+then
+ rm -rf source/debian
+fi
+
+# Download sources
+Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
+echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
+#echo "live-helper" >> chroot/root/dpkg-selection.txt
+Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
+rm -f chroot/root/dpkg-selection.txt
+
+# Sort sources
+for DSC in chroot/*.dsc
+do
+ SOURCE="`sed -n 's/^Source: //p' ${DSC}`"
+
+ case "${SOURCE}" in
+ lib?*)
+ LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+ ;;
+
+ *)
+ LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+ ;;
+ esac
+
+ # Install directory
+ mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
+
+ # Move files
+ mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
+done
+
+# Creating stage file
+Create_stagefile .stage/source_debian
Copied: dists/trunk/live-helper/helpers/lh_source_debian-live (from rev 1498, dists/trunk/live-helper/helpers/lh_source_config)
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_debian-live (rev 0)
+++ dists/trunk/live-helper/helpers/lh_source_debian-live 2007-05-16 13:27:07 UTC (rev 1509)
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# lh_source_debian-live(1) - copy debian-live config into source
+# 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="copy debian-live config into source"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Breakpoint "source_debian-live: Init"
+
+if [ "${LIVE_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian-live
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian-live ]
+then
+ rm -rf source/debian-live
+fi
+
+# Copy system configuration
+mkdir -p source/debian-live
+cp -a config source/debian-live
+
+# Create tarball
+cd source
+tar -cfz debian-live-config_`date +%Y%m%d.%s`.tar.gz debian-live
+cd "${OLDPWD}"
+
+rm -rf source/debian-live/config
+mv source/debian-live-config_*.tar.gz source/debian-live
+
+# Creating stage file
+Create_stagefile .stage/source_debian-live
Deleted: dists/trunk/live-helper/helpers/lh_source_download
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_download 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_download 2007-05-16 13:27:07 UTC (rev 1509)
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# lh_source_download(1) - download sources
-# 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="download sources"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/common
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/binary
-Read_conffile config/source
-Set_defaults
-
-Breakpoint "source_download: Init"
-
-if [ "${LIVE_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_download
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian ]
-then
- rm -rf source/debian
-fi
-
-# Download sources
-Chroot "dpkg --get-selections" | awk '{ print $1 }' > chroot/root/dpkg-selection.txt
-echo "${LIVE_BOOTLOADER}" >> chroot/root/dpkg-selection.txt
-#echo "live-helper" >> chroot/root/dpkg-selection.txt
-Chroot "xargs --arg-file=/root/dpkg-selection.txt apt-get source --download-only"
-rm -f chroot/root/dpkg-selection.txt
-
-# Sort sources
-for DSC in chroot/*.dsc
-do
- SOURCE="`sed -n 's/^Source: //p' ${DSC}`"
-
- case "${SOURCE}" in
- lib?*)
- LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
- ;;
-
- *)
- LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
- ;;
- esac
-
- # Install directory
- mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
-
- # Move files
- mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
-done
-
-# Creating stage file
-Create_stagefile .stage/source_download
Modified: dists/trunk/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_generic 2007-05-16 13:27:07 UTC (rev 1509)
@@ -44,7 +44,7 @@
if [ "${IMAGE}" = "generic" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_generic
Modified: dists/trunk/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_hdd 2007-05-16 13:27:07 UTC (rev 1509)
@@ -44,7 +44,7 @@
if [ "${IMAGE}" = "hdd" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_hdd
Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_iso 2007-05-16 13:27:07 UTC (rev 1509)
@@ -44,7 +44,7 @@
if [ "${IMAGE}" = "iso" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_iso
Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum 2007-05-16 13:27:07 UTC (rev 1509)
@@ -40,7 +40,7 @@
fi
# Requiring stage file
-Require_stagefile .stage/source_download
+Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_md5sum
Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_net 2007-05-16 13:27:07 UTC (rev 1509)
@@ -44,7 +44,7 @@
if [ "${IMAGE}" = "net" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_net
Modified: dists/trunk/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-05-16 13:27:07 UTC (rev 1509)
@@ -44,7 +44,7 @@
if [ "${IMAGE}" = "usb-hdd" ]
then
# Requiring stage file
- Require_stagefile .stage/source_download
+ Require_stagefile .stage/source_debian
# Checking stage file
Check_stagefile .stage/source_usb-hdd
Modified: dists/trunk/live-helper/manpages/lh_binary.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.de.1 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/lh_binary.de.1 2007-05-16 13:27:07 UTC (rev 1509)
@@ -27,7 +27,7 @@
erstell das CD/DVD Binary\-Image.
.IP "\fIlh_binary_linux-image\fR(1)" 4
kopiert linux\-image in das Binary\-Image.
-.IP "\fIlh_binary_localincludes\fR(1)" 4
+.IP "\fIlh_binary_local-includes\fR(1)" 4
kopiert lokale Dateien in das Binary\-Image.
.IP "\fIlh_binary_manifest\fR(1)" 4
erstellt die Paketliste des Root\-Dateisystemes.
Modified: dists/trunk/live-helper/manpages/lh_binary.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.en.1 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/lh_binary.en.1 2007-05-16 13:27:07 UTC (rev 1509)
@@ -27,7 +27,7 @@
creates the CD/DVD binary image.
.IP "\fIlh_binary_linux-image\fR(1)" 4
copies linux\-image into the binary image.
-.IP "\fIlh_binary_localincludes\fR(1)" 4
+.IP "\fIlh_binary_local-includes\fR(1)" 4
copies local files into the binary image.
.IP "\fIlh_binary_manifest\fR(1)" 4
creates the package list of the root filesystem.
Modified: dists/trunk/live-helper/manpages/lh_chroot.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_chroot.de.1 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/lh_chroot.de.1 2007-05-16 13:27:07 UTC (rev 1509)
@@ -25,15 +25,15 @@
macht Bauprozess interaktiv.
.IP "\fIlh_chroot_linux-image\fR(1)" 4
verwaltet /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_localhooks\fR(1)" 4
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
f\[:u]hrt lokale Hooks im chroot aus.
-.IP "\fIlh_chroot_localincludes\fR(1)" 4
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
kopiert lokale Dateien in den chroot.
.IP "\fIlh_chroot_localization\fR(1)" 4
installiert Lokalisierungspakete im chroot.
-.IP "\fIlh_chroot_localpackages\fR(1)" 4
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
installiert lokale Pakete im chroot.
-.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
installiert lokale Paketlisten im chroot.
.IP "\fIlh_chroot_packages\fR(1)" 4
installiert Pakete im chroot.
Modified: dists/trunk/live-helper/manpages/lh_chroot.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_chroot.en.1 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/lh_chroot.en.1 2007-05-16 13:27:07 UTC (rev 1509)
@@ -25,15 +25,15 @@
makes build interactive.
.IP "\fIlh_chroot_linux-image\fR(1)" 4
manages /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_localhooks\fR(1)" 4
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
executes local hooks in chroot.
-.IP "\fIlh_chroot_localincludes\fR(1)" 4
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
copies local files into chroot.
.IP "\fIlh_chroot_localization\fR(1)" 4
installs localization packages into chroot.
-.IP "\fIlh_chroot_localpackages\fR(1)" 4
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
installs local packages into chroot.
-.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
installs local packages lists into chroot.
.IP "\fIlh_chroot_packages\fR(1)" 4
installs packages into chroot.
Modified: dists/trunk/live-helper/manpages/lh_source.de.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.de.1 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/lh_source.de.1 2007-05-16 13:27:07 UTC (rev 1509)
@@ -11,9 +11,9 @@
.SH SOURCE HELPER
Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren source\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
-.IP "\fIlh_source_config\fR(1)" 4
+.IP "\fIlh_source_debian-live\fR(1)" 4
kopiert debian\-live Konfiguration in source.
-.IP "\fIlh_source_download\fR(1)" 4
+.IP "\fIlh_source_debian\fR(1)" 4
l\[:a]dt Paketquellen herunter.
.IP "\fIlh_source_generic\fR(1)" 4
erstellt den generischen Source-Tarball.
Modified: dists/trunk/live-helper/manpages/lh_source.en.1
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.en.1 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/lh_source.en.1 2007-05-16 13:27:07 UTC (rev 1509)
@@ -11,9 +11,9 @@
.SH SOURCE HELPERS
Here is the complete list of available source helper commands. See their man pages for additional documentation.
-.IP "\fIlh_source_config\fR(1)" 4
+.IP "\fIlh_source_debian-live\fR(1)" 4
copies debian\-live config into source.
-.IP "\fIlh_source_download\fR(1)" 4
+.IP "\fIlh_source_debian\fR(1)" 4
downloads sources.
.IP "\fIlh_source_generic\fR(1)" 4
creates the generic source tarball.
Modified: dists/trunk/live-helper/manpages/live-helper.de.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.de.7 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/live-helper.de.7 2007-05-16 13:27:07 UTC (rev 1509)
@@ -43,7 +43,7 @@
erstell das CD/DVD Binary\-Image.
.IP "\fIlh_binary_linux-image\fR(1)" 4
kopiert linux\-image in das Binary\-Image.
-.IP "\fIlh_binary_localincludes\fR(1)" 4
+.IP "\fIlh_binary_local-includes\fR(1)" 4
kopiert lokale Dateien in das Binary\-Image.
.IP "\fIlh_binary_manifest\fR(1)" 4
erstellt die Paketliste des Root\-Dateisystemes.
@@ -85,15 +85,15 @@
macht Bauprozess interaktiv.
.IP "\fIlh_chroot_linux-image\fR(1)" 4
verwaltet /etc/kernel\-img.conf.
-.IP "\fIlh_chroot_localhooks\fR(1)" 4
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
f\[:u]hrt lokale Hooks im chroot aus.
-.IP "\fIlh_chroot_localincludes\fR(1)" 4
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
kopiert lokale Dateien in den chroot.
.IP "\fIlh_chroot_localization\fR(1)" 4
installiert Lokalisierungspakete im chroot.
-.IP "\fIlh_chroot_localpackages\fR(1)" 4
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
installiert lokale Pakete im chroot.
-.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
installiert lokale Paketlisten im chroot.
.IP "\fIlh_chroot_packages\fR(1)" 4
installiert Pakete im chroot.
@@ -123,9 +123,9 @@
verwaltet Loop-Ger\[:a]te
.IP "\fIlh_source\fR(1)" 4
Meta\-Helper f\[:u]r lh_source_*
-.IP "\fIlh_source_config\fR(1)" 4
+.IP "\fIlh_source_debian-live\fR(1)" 4
kopiert debian\-live Konfiguration in source.
-.IP "\fIlh_source_download\fR(1)" 4
+.IP "\fIlh_source_debian\fR(1)" 4
l\[:a]dt Paketquellen herunter.
.IP "\fIlh_source_generic\fR(1)" 4
erstellt den generischen Source-Tarball.
Modified: dists/trunk/live-helper/manpages/live-helper.en.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.en.7 2007-05-16 10:21:29 UTC (rev 1508)
+++ dists/trunk/live-helper/manpages/live-helper.en.7 2007-05-16 13:27:07 UTC (rev 1509)
@@ -43,7 +43,7 @@
creates the CD/DVD binary image.
.IP "\fIlh_binary_linux-image\fR(1)" 4
copies linux\-image into the binary image.
-.IP "\fIlh_binary_localincludes\fR(1)" 4
+.IP "\fIlh_binary_local-includes\fR(1)" 4
copies local files into the binary image.
.IP "\fIlh_binary_manifest\fR(1)" 4
creates the package list of the root filesystem.
@@ -85,15 +85,15 @@
makes build interactive.
.IP "\fIlh_chroot_linux-image\fR(1)" 4
configures /etc/kernel\-img.conf in the chroot.
-.IP "\fIlh_chroot_localhooks\fR(1)" 4
+.IP "\fIlh_chroot_local-hooks\fR(1)" 4
executes additional local commands in the chroot.
-.IP "\fIlh_chroot_localincludes\fR(1)" 4
+.IP "\fIlh_chroot_local-includes\fR(1)" 4
copies local files into the binary image.
.IP "\fIlh_chroot_localization\fR(1)" 4
installs localization packages in the chroot.
-.IP "\fIlh_chroot_localpackages\fR(1)" 4
+.IP "\fIlh_chroot_local-packages\fR(1)" 4
installs local packages in the chroot.
-.IP "\fIlh_chroot_localpackageslists\fR(1)" 4
+.IP "\fIlh_chroot_local-packageslists\fR(1)" 4
installs local packages lists in the chroot.
.IP "\fIlh_chroot_packages\fR(1)" 4
installs packages in the chroot.
@@ -123,9 +123,9 @@
manages loop device handling
.IP "\fIlh_source\fR(1)" 4
meta\-helper for lh_source_*.
-.IP "\fIlh_source_config\fR(1)" 4
+.IP "\fIlh_source_debian-live\fR(1)" 4
copies config into source directory.
-.IP "\fIlh_source_download\fR(1)" 4
+.IP "\fIlh_source_debian\fR(1)" 4
downloads source packages.
.IP "\fIlh_source_generic\fR(1)" 4
creates generic source tarball.
More information about the Debian-live-changes
mailing list