[Debian-live-changes] r1209 - in dists/trunk/live-helper: doc
functions helpers
Daniel Baumann
daniel at alioth.debian.org
Tue May 1 13:02:50 UTC 2007
Author: daniel
Date: 2007-05-01 13:02:43 +0000 (Tue, 01 May 2007)
New Revision: 1209
Modified:
dists/trunk/live-helper/doc/ChangeLog
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_binary_chroot
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_binary_encryption
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_hdd
dists/trunk/live-helper/helpers/lh_binary_includes
dists/trunk/live-helper/helpers/lh_binary_iso
dists/trunk/live-helper/helpers/lh_binary_linuximage
dists/trunk/live-helper/helpers/lh_binary_localincludes
dists/trunk/live-helper/helpers/lh_binary_manifest
dists/trunk/live-helper/helpers/lh_binary_md5sum
dists/trunk/live-helper/helpers/lh_binary_memtest
dists/trunk/live-helper/helpers/lh_binary_net
dists/trunk/live-helper/helpers/lh_binary_rootfs
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/helpers/lh_binary_usb-hdd
dists/trunk/live-helper/helpers/lh_binary_yaboot
dists/trunk/live-helper/helpers/lh_bootstrap
dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
dists/trunk/live-helper/helpers/lh_chroot
dists/trunk/live-helper/helpers/lh_chroot_apt
dists/trunk/live-helper/helpers/lh_chroot_debianchroot
dists/trunk/live-helper/helpers/lh_chroot_hacks
dists/trunk/live-helper/helpers/lh_chroot_hooks
dists/trunk/live-helper/helpers/lh_chroot_hosts
dists/trunk/live-helper/helpers/lh_chroot_interactive
dists/trunk/live-helper/helpers/lh_chroot_linuximage
dists/trunk/live-helper/helpers/lh_chroot_localhooks
dists/trunk/live-helper/helpers/lh_chroot_localincludes
dists/trunk/live-helper/helpers/lh_chroot_localization
dists/trunk/live-helper/helpers/lh_chroot_localpackages
dists/trunk/live-helper/helpers/lh_chroot_localpackageslists
dists/trunk/live-helper/helpers/lh_chroot_packages
dists/trunk/live-helper/helpers/lh_chroot_packageslists
dists/trunk/live-helper/helpers/lh_chroot_proc
dists/trunk/live-helper/helpers/lh_chroot_resolv
dists/trunk/live-helper/helpers/lh_chroot_sources
dists/trunk/live-helper/helpers/lh_chroot_symlinks
dists/trunk/live-helper/helpers/lh_chroot_sysfs
dists/trunk/live-helper/helpers/lh_chroot_sysvinit
dists/trunk/live-helper/helpers/lh_chroot_sysvrc
dists/trunk/live-helper/helpers/lh_chroot_tasks
dists/trunk/live-helper/helpers/lh_clean
dists/trunk/live-helper/helpers/lh_config
dists/trunk/live-helper/helpers/lh_losetup
dists/trunk/live-helper/helpers/lh_source
dists/trunk/live-helper/helpers/lh_source_config
dists/trunk/live-helper/helpers/lh_source_download
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/helpers/lh_testroot
Log:
Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/doc/ChangeLog 2007-05-01 13:02:43 UTC (rev 1209)
@@ -2,6 +2,7 @@
* helpers/*:
- Added LH_INITRAMFS.
+ - Splitted config/image into config/binary and config/source.
* Uploaded 1.0~a8-1.
2007-04-26 Daniel Baumann <daniel at debian.org>
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-05-01 13:02:43 UTC (rev 1209)
@@ -206,6 +206,18 @@
esac
fi
+ # 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
+
# Setting live helper options
if [ -z "${LH_BREAKPOINTS}" ]
then
@@ -630,16 +642,4 @@
# 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
}
Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_chroot: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ -z "${LIVE_ENCRYPTION}" ]
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_BOOTLOADER}" != "grub" ]
Modified: dists/trunk/live-helper/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_hdd 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_includes 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_INCLUDES}" = "none" ]
Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_iso 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
for IMAGE in ${LIVE_BINARY_IMAGE}
Modified: dists/trunk/live-helper/helpers/lh_binary_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linuximage 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_linuximage 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_linuximage: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_localincludes 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_localincludes 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_localincludes: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_manifest 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_manifest: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_md5sum 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_md5sum: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_MEMTEST}" = "disabled" ]
Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_net 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_net: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_rootfs: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_BOOTLOADER}" != "syslinux" ]
Modified: dists/trunk/live-helper/helpers/lh_binary_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "binary_usb-hdd: Init"
Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
if [ "${LIVE_BOOTLOADER}" != "yaboot" ]
Modified: dists/trunk/live-helper/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_bootstrap 2007-05-01 13:02:43 UTC (rev 1209)
@@ -30,10 +30,11 @@
Breakpoint "bootstrap: Init"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
# Bootstrapping system
Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap 2007-05-01 13:02:43 UTC (rev 1209)
@@ -28,10 +28,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "bootstrap_cdeboostrap: Init"
Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap 2007-05-01 13:02:43 UTC (rev 1209)
@@ -28,10 +28,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "bootstrap_debootstrap: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_apt: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_debianchroot 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_debianchroot: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_hacks: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_hooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hooks 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_hooks 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_hooks: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_hosts 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_hosts: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_interactive 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_interactive: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linuximage 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_linuximage 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_linuximage: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_localhooks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localhooks 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_localhooks 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_localhooks: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localincludes 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_localincludes 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_localincludes: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_localization
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localization 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_localization 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_localization: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_localpackages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localpackages 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_localpackages 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_localpackages: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_localpackageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_localpackageslists 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_localpackageslists 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_localpackageslists: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_packages
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packages 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_packages 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_packages: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_packageslists
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_packageslists 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_packageslists 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_packageslists: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc 2007-05-01 13:02:43 UTC (rev 1209)
@@ -28,10 +28,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_proc: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_resolv: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_sources: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_symlinks: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-05-01 13:02:43 UTC (rev 1209)
@@ -28,10 +28,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_sysfs: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvinit 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_sysvinit: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvrc 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_sysvrc: Init"
Modified: dists/trunk/live-helper/helpers/lh_chroot_tasks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_tasks 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_chroot_tasks 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "chroot_tasks: Init"
Modified: dists/trunk/live-helper/helpers/lh_clean
===================================================================
--- dists/trunk/live-helper/helpers/lh_clean 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_clean 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
case "${1}" in
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_config 2007-05-01 13:02:43 UTC (rev 1209)
@@ -46,7 +46,8 @@
Read_conffile "${LIVE_ROOT}"/config/common
Read_conffile "${LIVE_ROOT}"/config/bootstrap
Read_conffile "${LIVE_ROOT}"/config/chroot
- Read_conffile "${LIVE_ROOT}"/config/image
+ Read_conffile "${LIVE_ROOT}"/config/binary
+ Read_conffile "${LIVE_ROOT}"/config/source
fi
# Setting defaults
@@ -141,6 +142,14 @@
# (Default: ${LIVE_ROOT})
LIVE_ROOT="${LIVE_ROOT}"
+# \$LIVE_INCLUDES: set includes
+# (Default: ${LIVE_INCLUDES})
+LIVE_INCLUDES="${LIVE_INCLUDES}"
+
+# \$LIVE_TEMPLATES: set templates
+# (Default: ${LIVE_TEMPLATES})
+LIVE_TEMPLATES="${LIVE_TEMPLATES}"
+
# Live-helper options
# \$LH_ROOT_COMMAND: use sudo or equivalent
@@ -269,9 +278,9 @@
LIVE_SECTIONS="${LIVE_SECTIONS}"
EOF
-# Creating lh_image_* configuration
-cat > "${LIVE_ROOT}"/config/image << EOF
-# config/chroot: configuration for lh_image_*
+# Creating lh_binary_* configuration
+cat > "${LIVE_ROOT}"/config/binary << EOF
+# config/chroot: configuration for lh_binary_*
# \$LIVE_BOOTAPPEND: set boot parameters
# (Default: empty)
@@ -313,10 +322,6 @@
# (Default: ${LIVE_SERVER_PATH})
LIVE_SERVER_PATH="${LIVE_SERVER_PATH}"
-# \$LIVE_SOURCE: set source option
-# (Default: ${LH_SOURCE})
-LIVE_SOURCE="${LIVE_SOURCE}"
-
# \$LIVE_BOOTLOADER: set bootloader
# (Default: ${LIVE_BOOTLOADER})
LIVE_BOOTLOADER="${LIVE_BOOTLOADER}"
@@ -332,18 +337,19 @@
# \$LIVE_BINARY_IMAGE: set image type
# (Default: ${LIVE_BINARY_IMAGE})
LIVE_BINARY_IMAGE="${LIVE_BINARY_IMAGE}"
+EOF
+# Creating lh_source_* configuration
+cat > "${LIVE_ROOT}"/config/source << EOF
+# config/chroot: configuration for lh_source_*
+
+# \$LIVE_SOURCE: set source option
+# (Default: ${LH_SOURCE})
+LIVE_SOURCE="${LIVE_SOURCE}"
+
# \$LIVE_SOURCE_IMAGE: set image type
# (Default: ${LIVE_SOURCE_IMAGE})
LIVE_SOURCE_IMAGE="${LIVE_SOURCE_IMAGE}"
-
-# \$LIVE_INCLUDES: set includes
-# (Default: ${LIVE_INCLUDES})
-LIVE_INCLUDES="${LIVE_INCLUDES}"
-
-# \$LIVE_TEMPLATES: set templates
-# (Default: ${LIVE_TEMPLATES})
-LIVE_TEMPLATES="${LIVE_TEMPLATES}"
EOF
# Creating lh_binary_* directories
Modified: dists/trunk/live-helper/helpers/lh_losetup
===================================================================
--- dists/trunk/live-helper/helpers/lh_losetup 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_losetup 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "losetup: Init"
Modified: dists/trunk/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_config 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_config 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_config: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_download
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_download 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_download 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_download: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_generic 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_generic: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_hdd 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_hdd: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_iso 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_iso: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_md5sum: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_net 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_net: Init"
Modified: dists/trunk/live-helper/helpers/lh_source_usb-hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-05-01 13:02:43 UTC (rev 1209)
@@ -25,10 +25,11 @@
Echo_debug "Init ${PROGRAM}"
# Reading configuration files
+Read_conffile config/common
Read_conffile config/bootstrap
Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
+Read_conffile config/binary
+Read_conffile config/source
Set_defaults
Breakpoint "source_usb-hdd: Init"
Modified: dists/trunk/live-helper/helpers/lh_testroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_testroot 2007-05-01 10:02:55 UTC (rev 1208)
+++ dists/trunk/live-helper/helpers/lh_testroot 2007-05-01 13:02:43 UTC (rev 1209)
@@ -24,6 +24,10 @@
# 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
Echo_debug "Init ${PROGRAM}"
More information about the Debian-live-changes
mailing list