[Debian-live-changes] r1164 - in dists/trunk/live-helper: functions helpers manpages

[Daniel Baumann]

Author: daniel
Date: 2007-04-25 15:48:22 +0000 (Wed, 25 Apr 2007)
New Revision: 1164

Modified:
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_binary
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_config
   dists/trunk/live-helper/manpages/lh_binary.1.de
   dists/trunk/live-helper/manpages/live-helper.7.de
Log:


Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-04-25 15:25:42 UTC (rev 1163)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-04-25 15:48:22 UTC (rev 1164)
@@ -549,6 +549,12 @@
 		LIVE_MEMTEST="memtest86+"
 	fi
 
+	# Setting debian-installer option
+	if [ -z "${LIVE_INSTALLER}" ]
+	then
+		LIVE_INSTALLER="enabled"
+	fi
+
 	# Setting iso volume
 	if [ -z "${LIVE_ISO_VOLUME}" ]
 	then

Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary	2007-04-25 15:25:42 UTC (rev 1163)
+++ dists/trunk/live-helper/helpers/lh_binary	2007-04-25 15:48:22 UTC (rev 1164)
@@ -42,6 +42,7 @@
 
 # Prepare images
 lh_binary_linuximage "${@}"
+lh_binary_installer "${@}"
 lh_binary_memtest "${@}"
 lh_binary_grub "${@}"
 lh_binary_syslinux "${@}"

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-25 15:25:42 UTC (rev 1163)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-04-25 15:48:22 UTC (rev 1164)
@@ -77,7 +77,7 @@
 		;;
 esac
 
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_INSTALLER}" = "enabled" ]
 then
 	# Working arround vfat limitations
 	if [ "${LIVE_BINARY_IMAGE}" = "usb" ]

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-04-25 15:25:42 UTC (rev 1163)
+++ dists/trunk/live-helper/helpers/lh_config	2007-04-25 15:48:22 UTC (rev 1164)
@@ -285,6 +285,10 @@
 # (Default: ${LIVE_MEMTEST})
 LIVE_MEMTEST="${LIVE_MEMTEST}"
 
+# \$LIVE_INSTALLER: set debian-installer
+# (Default: ${LIVE_INSTALLER})
+LIVE_INSTALLER="${LIVE_INSTALLER}"
+
 # \$LIVE_ISO_VOLUME: set iso volume
 # (Default: ${LIVE_ISO_VOLUME})
 LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}"

Modified: dists/trunk/live-helper/manpages/lh_binary.1.de
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.1.de	2007-04-25 15:25:42 UTC (rev 1163)
+++ dists/trunk/live-helper/manpages/lh_binary.1.de	2007-04-25 15:48:22 UTC (rev 1164)
@@ -22,7 +22,7 @@
 .IP "\fIlh_binary_includes\fR(1)" 4
 kopiert Dateien in das Binary\-Image.
 .IP "\fIlh_binary_installer\fR(1)" 4
-kopiert Debian Installer in das Binary\-Image.
+kopiert debian\-installer in das Binary\-Image.
 .IP "\fIlh_binary_iso\fR(1)" 4
 erstell das CD/DVD Binary\-Image.
 .IP "\fIlh_binary_linuximage\fR(1)" 4

Modified: dists/trunk/live-helper/manpages/live-helper.7.de
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.7.de	2007-04-25 15:25:42 UTC (rev 1163)
+++ dists/trunk/live-helper/manpages/live-helper.7.de	2007-04-25 15:48:22 UTC (rev 1164)
@@ -38,7 +38,7 @@
 .IP "\fIlh_binary_includes\fR(1)" 4
 kopiert Dateien in das Binary\-Image.
 .IP "\fIlh_binary_installer\fR(1)" 4
-kopiert Debian-Installer in das Binary\-Image.
+kopiert debian-\installer in das Binary\-Image.
 .IP "\fIlh_binary_iso\fR(1)" 4
 erstell das CD/DVD Binary\-Image.
 .IP "\fIlh_binary_linuximage\fR(1)" 4