Adding live-helper 1.0~a6-1.

6 files changed, 85 insertions, 90 deletions

diff --git a/doc/CREDITS b/doc/CREDITS
index f0bd7ef..120929c 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -29,3 +29,6 @@ Special thanks (alphabetical order):
   * Sebastian Raveau <sebastien.raveau@epita.fr> for his work on encryption
     support.
   * Scott Edwards <debian@foss.daxal.com> for his work on d-i/g-i integration.
+
+...and countless other people showed up on the #debian-live IRC channel since
+February 2006: thanks for all your help, ideas, and wishes.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8412303..65b5094 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,74 @@
+2007-04-16  Daniel Baumann  <daniel@debian.org>
+
+	* functions/defaults.sh:
+	  - Using lsb_release, if existing, to set default mode to ubuntu on
+	    ubuntu systems.
+	  - Moved desktop task to the end, so that gdm doesn't take
+	    gnome-session as default.
+	* helpers/lh_chroot_hooks:
+	  - Added simple --hooks for easy testing.
+	* Uploaded 1.0~a6-1.
+
+2007-04-15  Daniel Baumann  <daniel@debian.org>
+
+	* functions/defaults.sh:
+	  - Set LH_APT to apt-get when using mini or minimal.
+	* helpers/lh_chroot_sources:
+	  - Excluding comments from local sources lists.
+	* helpers/lh_bootstrap_cdebootstrap:
+	  - Removing imported configuration files by cdebootstrap.
+
+2007-04-13  Daniel Baumann  <daniel@debian.org>
+
+	* Moved examples from /usr/share/doc to /usr/share/live-helper.
+	* examples/bpo.sources.list:
+	  - Added.
+	* functions/defaults.sh:
+	  - Setting LH_GENISOIMAGE on ubuntu to legacy mkisofs.
+	* helpers/lh_clean:
+	  - Added missing removal of generic source.
+
+2007-04-12  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_config, make-live:
+	  - Adding --config.
+	* helpers/lh_binary_memtester86:
+	  - Renamed to lh_binary_memtest, made more generic.
+	* functions/defaults.sh:
+	  - Setting default distribution to etch until 2.6.20 has setteled in
+	    unstable.
+
+2007-04-11  Daniel Baumann  <daniel@debian.org>
+
+	* Merging from sidux fllbuilder 1.0.4:
+	  - functions/chroot: Added LH_DEBCONF_NOWARNINGS.
+	  - helpers/lh_chroot_linuximage: Added additional options to
+	    kernel-img.conf.
+	  - helpers/lh_chroot_proc: Made binfmt umount conditional.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+	* helpers/lh_binary_grub, lh_binary_syslinux:
+	  - Added failsafe kernel entries.
+	* helpers/lh_chroot_apt:
+	  - Using apt.conf.d also for apt, not just for aptitude.
+	  - Minor code cleanup.
+	* helpers/lh_source_*:
+	  - Minor code cleanup.
+	* helpers/lh_source_download:
+	  - Added LIVE_BOOTLOADER to the list of source packages.
+	* contrib/grub-splash/*, templates/grub/splash.xpm.gz:
+	  - Added.
+
+2007-04-10  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_includes, includes/*:
+	  - Redone.
+
+2007-04-09  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_yaboot, templates/yaboot:
+	  - Added.
+
 2007-04-09  Daniel Baumann  <daniel@debian.org>
 
 	* helpers/lh_config, make-live, functions/defaults.sh:
@@ -5,6 +76,7 @@
 	* helpers/lh_chroot_sources:
 	  - Added check for LIVE_MIRROR_BUILD* to be equal to
 	    LIVE_MIRROR_IMAGE*.
+	* Uploaded 1.0~a5-1.
 
 2007-04-08  Daniel Baumann  <daniel@debian.org>
 
diff --git a/doc/FAQ b/doc/FAQ
index 0bdc3ba..593346b 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -4,14 +4,18 @@ Debian Live: Frequently Asked Questions (FAQ)
 Build Time
 ----------
 
+Q: Is live-helper/make-live Debian specific?
+A: live-helper supports Debian and Ubuntu right now. Adding automatic defaults
+   for other Debian derivatives is easy - let us know about them and we may
+   include it.
+
 Q: How do I drop in to a shell during make-live chroot process?
-A: Use "--interactive shell", then exit when you have made the setting changes
-   you want and the build process will continue.
+A: Use "--interactive shell", then exit with 'logout' when you have made the
+   setting changes you want and the build process will continue.
 
 Q: Where to set the username or the hostname?
 A: casper uses default username 'casper' and hostname 'live'. You can specify
-   them by passing 'username=' and 'hostname=' as kernel parameters (In previous
-   casper releases it was 'host=').
+   them by passing 'username=' and 'hostname=' as kernel parameters.
 
    live-helper automatically sets the username to 'user' and the hostname to
    'debian'. If you want to change this at build time, pass --username and
@@ -22,8 +26,8 @@ Run Time
 --------
 
 Q: What is the root password?
-A: There is none. You can switch to root with 'sudo -i' or set a password with
-   'sudo passwd'.
+A: There is none set. You can switch to root with 'sudo -i' or set a password
+   with 'sudo passwd'.
 
 Q: What is the user password?
 A: The password for the default user is 'live'.
diff --git a/doc/examples/beryl-hook.sh b/doc/examples/beryl-hook.sh
deleted file mode 100755
index ef076e4..0000000
--- a/doc/examples/beryl-hook.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# 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.
-# At boot prompt, type 'linux aixgl', press enter and have fun.
-
-# Update sources.list
-cat >> /etc/apt/sources.list << EOF
-# beryl-project
-deb http://debian.beryl-project.org/ etch main
-EOF
-
-if grep deb-src /etc/apt/sources.list
-then
-	echo "deb-src http://debian.beryl-project.org/ etch main" >> /etc/apt/sources.list
-fi
-
-# Import archive signing key
-wget -O - http://debian.beryl-project.org/root@lupine.me.uk.gpg | apt-key add -
-
-# Update indices
-apt-get update
-
-# Install packages
-PACKAGES="beryl beryl-core beryl-manager beryl-plugins beryl-plugins-unsupported beryl-settings beryl-settings-bindings beryl-settings-simple"
-
-if [ -f /usr/bin/gnome-session ]
-then
-	PACKAGES="${PACKAGES} emerald emerald-themes heliodor"
-fi
-
-if [ -f /usr/bin/kstart ]
-then
-	PACKAGES="${PACKAGES} aquamarine"
-fi
-
-apt-get install --yes ${PACKAGES}
-
-# Add init script
-cat > /etc/init.d/aixgl << EOF
-#!/bin/sh
-
-if cat /proc/cmdline | grep aixgl > /dev/null
-then
-	echo "Configuring xorg for aixgl..."
-
-	echo "" >> /etc/X11/xorg.conf
-	echo "# Added by beryl-hook.sh" >> /etc/X11/xorg.conf
-	echo "Section \"Extensions\"" >> /etc/X11/xorg.conf
-	echo " Option \"Composite\" \"Enable\"" >> /etc/X11/xorg.conf
-	echo "EndSection" >> /etc/X11/xorg.conf
-
-	sed -i -e "s/Section \"Device\""/"Section \"Device\"\n\t Option \"XAANoOffscreenPixmaps\" \"true\"\n\t Option \"AddARGBGLXVisuals\" \"on\"\n\t Option \"AllowGLXWithComposite\" \"true\"/" -e "s/Section \"Module\""/"Section \"Module\"\n\t Load \"i2c\"\n\t Load \"int10\"\n\t Load \"xtrap\"\n\t Load \"vbe\"/" /etc/X11/xorg.conf
-fi
-EOF
-
-chmod 0755 /etc/init.d/aixgl
-update-rc.d aixgl defaults
diff --git a/doc/examples/java-hook.sh b/doc/examples/java-hook.sh
deleted file mode 100755
index 77c931b..0000000
--- a/doc/examples/java-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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 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
-# Java do not allow this, therefore we need to overwrite DEBIAN_FRONTEND for
-# this apt-get call only.
-
-DEBIAN_FRONTEND="dialog" apt-get install --yes sun-java6-bin sun-java6-demo \
-	sun-java6-doc sun-java6-fonts sun-java6-jdk sun-java6-jre \
-	sun-java6-plugin sun-java6-source
diff --git a/doc/examples/live.sources.list b/doc/examples/live.sources.list
deleted file mode 100644
index 10fba02..0000000
--- a/doc/examples/live.sources.list
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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