[Debian-live-changes] r963 - in dists/trunk/live-helper: doc functions manpages

[Daniel Baumann]

Author: daniel
Date: 2007-04-06 12:14:35 +0000 (Fri, 06 Apr 2007)
New Revision: 963

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/functions/arguments.sh
   dists/trunk/live-helper/functions/breakpoints.sh
   dists/trunk/live-helper/functions/chroot.sh
   dists/trunk/live-helper/functions/echo.sh
   dists/trunk/live-helper/functions/stagefile.sh
   dists/trunk/live-helper/manpages/live-helper.7
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-06 12:14:35 UTC (rev 963)
@@ -1,9 +1,13 @@
 2007-04-06  Daniel Baumann  <daniel at debian.org>
 
+	* functions/chroot.sh:
+	  - Adding /usr/local to path.
 	* functions/lockfile.sh:
 	  - Added additional signals to the trap.
 	* helpers/lh_binary_includes:
 	  - Respect LIVE_INCLUDES=none.
+	* manpages/*:
+	  - Updated.
 
 2007-04-05  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-helper/functions/arguments.sh
===================================================================
--- dists/trunk/live-helper/functions/arguments.sh	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/functions/arguments.sh	2007-04-06 12:14:35 UTC (rev 963)
@@ -11,7 +11,7 @@
 
 Arguments ()
 {
-	ARGUMENTS="`getopt --longoptions conffile:,debug,force,help,logfile:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
+	ARGUMENTS="`getopt --longoptions breakpoints,conffile:,debug,force,help,logfile:,quiet,usage,verbose,version --name=${PROGRAM} --options huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then
@@ -24,16 +24,20 @@
 	while true
 	do
 		case "${1}" in
+			--breakpoints)
+				LH_BREAKPOINTS="true"; shift
+				;;
+
 			--conffile)
-				CONFFILE="${2}"; shift 2
+				LH_CONFFILE="${2}"; shift 2
 				;;
 
 			--debug)
-				DEBUG="true"; shift
+				LH_DEBUG="true"; shift
 				;;
 
 			--force)
-				FORCE="true"; shift
+				LH_FORCE="true"; shift
 				;;
 
 			-h|--help)
@@ -41,11 +45,11 @@
 				;;
 
 			--logfile)
-				LOGFILE="${2}"; shift 2
+				LH_LOGFILE="${2}"; shift 2
 				;;
 
 			--quiet)
-				QUIET="true"; shift
+				LH_QUIET="true"; shift
 				;;
 
 			-u|--usage)
@@ -53,7 +57,7 @@
 				;;
 
 			--verbose)
-				VERBOSE="true"; shift
+				LH_VERBOSE="true"; shift
 				;;
 
 			-v|--version)

Modified: dists/trunk/live-helper/functions/breakpoints.sh
===================================================================
--- dists/trunk/live-helper/functions/breakpoints.sh	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/functions/breakpoints.sh	2007-04-06 12:14:35 UTC (rev 963)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# breakpoints.sh
+# breakpoints.sh - run with breakpoints
 # Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
 #
 # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.

Modified: dists/trunk/live-helper/functions/chroot.sh
===================================================================
--- dists/trunk/live-helper/functions/chroot.sh	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/functions/chroot.sh	2007-04-06 12:14:35 UTC (rev 963)
@@ -15,5 +15,5 @@
 
 	# Executing commands in chroot
 	Echo_debug "Executing: ${COMMANDS}"
-	chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" ${COMMANDS}
+	chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" ${COMMANDS}
 }

Modified: dists/trunk/live-helper/functions/echo.sh
===================================================================
--- dists/trunk/live-helper/functions/echo.sh	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/functions/echo.sh	2007-04-06 12:14:35 UTC (rev 963)
@@ -11,7 +11,7 @@
 
 Echo_debug ()
 {
-	if [ "${DEBUG}" = "true" ]
+	if [ "${LH_DEBUG}" = "true" ]
 	then
 		echo "D: ${@}"
 	fi
@@ -24,7 +24,7 @@
 
 Echo_message ()
 {
-	if [ "${QUIET}" != "true" ]
+	if [ "${LH_QUIET}" != "true" ]
 	then
 		echo "P: ${@}"
 	fi
@@ -32,7 +32,7 @@
 
 Echo_verbose ()
 {
-	if [ "${VERBOSE}" = "true" ]
+	if [ "${LH_VERBOSE}" = "true" ]
 	then
 		echo "I: ${@}"
 	fi

Modified: dists/trunk/live-helper/functions/stagefile.sh
===================================================================
--- dists/trunk/live-helper/functions/stagefile.sh	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/functions/stagefile.sh	2007-04-06 12:14:35 UTC (rev 963)
@@ -17,7 +17,7 @@
 	# Checking stage file
 	if [ -f "${FILE}" ]
 	then
-		if [ "${FORCE}" = "true" ]
+		if [ "${LH_FORCE}" = "true" ]
 		then
 			# Forcing execution
 			rm -f "${FILE}"

Modified: dists/trunk/live-helper/manpages/live-helper.7
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.7	2007-04-06 12:06:55 UTC (rev 962)
+++ dists/trunk/live-helper/manpages/live-helper.7	2007-04-06 12:14:35 UTC (rev 963)
@@ -138,6 +138,8 @@
 
 .SH LIVE\-HELPER OPTIONS
 The following command line options are supported by all live\-helper programs.
+.IP "\fB\-\-breakpoints\fR" 4
+run with breakpoints
 .IP "\fB\-\-conffile\fR" 4
 use custom configuration file
 .IP "\fB\-\-debug\fR" 4