[Debian-live-changes] r919 - in dists/trunk/live-helper: doc helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-02 12:58:35 +0000 (Mon, 02 Apr 2007)
New Revision: 919

Modified:
   dists/trunk/live-helper/doc/README
   dists/trunk/live-helper/helpers/lh_bootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
   dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
Log:


Modified: dists/trunk/live-helper/doc/README
===================================================================
--- dists/trunk/live-helper/doc/README	2007-04-02 12:11:24 UTC (rev 918)
+++ dists/trunk/live-helper/doc/README	2007-04-02 12:58:35 UTC (rev 919)
@@ -1,7 +1,8 @@
   * lh_config
 
   * lh_bootstrap
-      |_ lh_cdebootstrap | lh_debootstrap
+      |_ lh_cdebootstrap
+      |_ lh_debootstrap
 
   * lh_chroot
       |_ lh_chroot_proc install
@@ -53,6 +54,7 @@
       |
       |_ lh_binary_linuximage
       |_ lh_binary_memtest86
+      |_ lh_binary_grub
       |_ lh_binary_syslinux
       |_ lh_binary_includes
       |_ lh_binary_localincludes

Modified: dists/trunk/live-helper/helpers/lh_bootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap	2007-04-02 12:11:24 UTC (rev 918)
+++ dists/trunk/live-helper/helpers/lh_bootstrap	2007-04-02 12:58:35 UTC (rev 919)
@@ -30,4 +30,5 @@
 Set_defaults
 
 # Bootstrapping system
-lh_bootstrap_"${LH_BOOTSTRAP}" "${@}"
+lh_bootstrap_cdebootstrap "${@}"
+lh_bootstrap_debootstrap "${@}"

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-02 12:11:24 UTC (rev 918)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_cdebootstrap	2007-04-02 12:58:35 UTC (rev 919)
@@ -33,6 +33,11 @@
 Read_conffile config/bootstrap
 Set_defaults
 
+if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ]
+then
+	exit 0
+fi
+
 # Checking stage file
 Check_stagefile .stage/bootstrap
 

Modified: dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap
===================================================================
--- dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-02 12:11:24 UTC (rev 918)
+++ dists/trunk/live-helper/helpers/lh_bootstrap_debootstrap	2007-04-02 12:58:35 UTC (rev 919)
@@ -33,6 +33,11 @@
 Read_conffile config/bootstrap
 Set_defaults
 
+if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
+then
+	exit 0
+fi
+
 # Checking stage file
 Check_stagefile .stage/bootstrap