Adding live-helper 1.0~a5-1.

6 files changed, 55 insertions, 5 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index dc720ff21..841230336 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,43 @@
+2007-04-09  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_config, make-live, functions/defaults.sh:
+	  - Added mode to distinguish between Debian and Ubuntu.
+	* helpers/lh_chroot_sources:
+	  - Added check for LIVE_MIRROR_BUILD* to be equal to
+	    LIVE_MIRROR_IMAGE*.
+
+2007-04-08  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_net:
+	  - Added check for namespace collision with LIVE_SERVER_PATH.
+	* helpers/lh_binary_grub:
+	  - Added functionality for usb|hdd images.
+
+2007-04-07  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_chroot_sources:
+	  - Moved check for local source lists from
+	    config/sources.lists.{build,image} to
+	    config/chroot_sources/*.{build,image}.
+	  - Added check for local gpg keys in
+	    config/chroot_sources/*.{build,image}.gpg.
+	  - Added check for local keyring packages in
+	    config/chroot_sources/*.deb.
+	  - Added LIVE_KEYRING_PACKAGES.
+
+2007-04-06  Daniel Baumann  <daniel@debian.org>
+
+	* functions/breakpoints.sh, helpers/*:
+	  - Added initial breakpoints.
+	* 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@debian.org>
 
 	* helpers/lh_binary_grub, templates/grub/menu.lst:
diff --git a/doc/FAQ b/doc/FAQ
index ce9ad7c44..0bdc3bafb 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -22,8 +22,8 @@ Run Time
 --------
 
 Q: What is the root password?
-A: There is none. You can switch to root with 'sudo su -' or set a password with
+A: There is none. You can switch to root with 'sudo -i' or set a password with
    'sudo passwd'.
 
 Q: What is the user password?
-A: The user password for 'user' is 'live'.
+A: The password for the default user is 'live'.
diff --git a/doc/TODO b/doc/TODO
index 6444a2672..5d314647b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -9,7 +9,6 @@ Todo:
 
   * write manpage and documentation
   * write lh_binary_di and lh_binary_gi
-  * write lh_binary_grub
 
 Later:
   * Add win32 autorun like
diff --git a/doc/examples/beryl-hook.sh b/doc/examples/beryl-hook.sh
index 1591487d2..ef076e47e 100755
--- a/doc/examples/beryl-hook.sh
+++ b/doc/examples/beryl-hook.sh
@@ -2,8 +2,8 @@
 
 # This is a hook for live-helper(7) to install beryl and enable aixgl.
 # It was originally written by Inigo Tejedor Arrondo <inigo@navarrux.org>.
-# To enable it, copy this hook into your config/chroot_localhooks directory.
 #
+# To enable it, copy this hook into your config/chroot_localhooks directory.
 # At boot prompt, type 'linux aixgl', press enter and have fun.
 
 # Update sources.list
diff --git a/doc/examples/java-hook.sh b/doc/examples/java-hook.sh
index 0574f3a98..77c931b68 100755
--- a/doc/examples/java-hook.sh
+++ b/doc/examples/java-hook.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # This is a hook for live-helper(7) to install sun-java.
-# To enable it, copy this hook into your config/chroot_localhooks directory.
+#
+# To enable it, copy this hook into your config/chroot_localhooks directory and
+# don't forget to enable non-free in LIVE_SECTIONS.
 #
 # live-helper sets DEBIAN_FRONTEND to 'noninteractive' to advise debconf to not
 # ask any questions while installing packages. Suns redistribution terms for
diff --git a/doc/examples/live.sources.list b/doc/examples/live.sources.list
new file mode 100644
index 000000000..10fba026a
--- /dev/null
+++ b/doc/examples/live.sources.list
@@ -0,0 +1,9 @@
+# This is a sources.list for live-helper(7) to use packages from the
+# Debian Live Etch backports repository.
+#
+# To enable it, copy this file to your config/chroot_sources directory, once
+# as e.g. live.build and once as live.image.
+
+# Debian Live backports for Etch
+deb http://live.debian.net/debian/ etch main
+deb-src http://live.debian.net/debian/ etch main