From 799d4bfb31c279b72088c8ee8a16c2710ab8a309 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 23 Sep 2007 10:04:48 +0200
Subject: Adding live-helper 1.0~a3-1.

---
 helpers/lh_chroot | 80 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 30 deletions(-)

(limited to 'helpers/lh_chroot')

diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 75f3174cc..045b3ac9f 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -1,6 +1,13 @@
 #!/bin/sh
 
 # lh_chroot(1) - customize the Debian system
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@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
@@ -8,43 +15,56 @@ do
 	. ${FUNCTION}
 done
 
+# Set static variables
+DESCRIPTION="customize the Debian system"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+if [ "${FORCE}" = "true" ]
+then
+	OPTIONS="${OPTIONS} --force"
+fi
+
 # Reading configuration files
 Read_conffile config/common
 Read_conffile config/chroot
 Set_defaults
 
 # Configuring chroot
-lh_chroot_proc install
-lh_chroot_sysfs install
-lh_chroot_debianchroot install
-lh_chroot_sysvrc install
-lh_chroot_hosts install
-lh_chroot_resolv install
-lh_chroot_apt install
-lh_chroot_sources install
-lh_chroot_linuximage install
+lh_chroot_proc install "${OPTIONS}"
+lh_chroot_sysfs install "${OPTIONS}"
+lh_chroot_debianchroot install "${OPTIONS}"
+lh_chroot_sysvrc install "${OPTIONS}"
+lh_chroot_hosts install "${OPTIONS}"
+lh_chroot_resolv install "${OPTIONS}"
+lh_chroot_apt install "${OPTIONS}"
+lh_chroot_sources install "${OPTIONS}"
+lh_chroot_linuximage install "${OPTIONS}"
 
 # Customizing chroot
-lh_chroot_tasks
-lh_chroot_packageslist
-lh_chroot_packages
-lh_chroot_localpackages
-lh_chroot_localpackageslist
-lh_chroot_localization
-lh_chroot_hacks
-lh_chroot_localincludes
-lh_chroot_sysvinit
-lh_chroot_hooks
-lh_chroot_localhooks
-lh_chroot_symlinks
+lh_chroot_tasks "${OPTIONS}"
+lh_chroot_packageslists "${OPTIONS}"
+lh_chroot_packages "${OPTIONS}"
+lh_chroot_localpackages "${OPTIONS}"
+lh_chroot_localpackageslists "${OPTIONS}"
+lh_chroot_localization "${OPTIONS}"
+lh_chroot_hacks "${OPTIONS}"
+lh_chroot_localincludes "${OPTIONS}"
+lh_chroot_sysvinit "${OPTIONS}"
+lh_chroot_hooks "${OPTIONS}"
+lh_chroot_localhooks "${OPTIONS}"
+lh_chroot_symlinks "${OPTIONS}"
+lh_chroot_interactive "${OPTIONS}"
 
 # Deconfiguring chroot
-lh_chroot_linuximage remove
-lh_chroot_sources remove
-lh_chroot_apt remove
-lh_chroot_resolv remove
-lh_chroot_hosts remove
-lh_chroot_sysvrc remove
-lh_chroot_debianchroot remove
-lh_chroot_sysfs remove
-lh_chroot_proc remove
+lh_chroot_linuximage remove "${OPTIONS}"
+lh_chroot_sources remove "${OPTIONS}"
+lh_chroot_apt remove "${OPTIONS}"
+lh_chroot_resolv remove "${OPTIONS}"
+lh_chroot_hosts remove "${OPTIONS}"
+lh_chroot_sysvrc remove "${OPTIONS}"
+lh_chroot_debianchroot remove "${OPTIONS}"
+lh_chroot_sysfs remove "${OPTIONS}"
+lh_chroot_proc remove "${OPTIONS}"
-- 
cgit v1.2.3