[SCM] live-manual branch, debian-next, updated. debian/3.0_a8-1-49-gc39fd8e

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit e6c529afc9e8f5b36128d9e4a08a6085c390cc6e
Author: Ben Armstrong <synrg at debian.org>
Date:   Mon Nov 7 20:46:42 2011 -0400

    Updating to 3.x, hooks and preseeding.

diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 540b172..0ff1407 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -76,7 +76,7 @@ Hooks allow commands to be performed in the chroot and binary stages of the buil
 
 3~live-chroot-local-hooks Live/chroot local hooks
 
-To run commands in the chroot stage, create a hook script containing the commands in the #{config/chroot_local-hooks}# directory. The hook will run in the chroot after the rest of your chroot configuration has been applied, so remember to ensure your configuration includes all packages and files your hook needs in order to run. See the example chroot hook scripts for various common chroot customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
+To run commands in the chroot stage, create a hook script with a #{.chroot}# suffix containing the commands in the #{config/hooks/}# directory. The hook will run in the chroot after the rest of your chroot configuration has been applied, so remember to ensure your configuration includes all packages and files your hook needs in order to run. See the example chroot hook scripts for various common chroot customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
 
 3~boot-time-hooks Boot-time hooks
 
@@ -84,10 +84,10 @@ To execute commands at boot time, you can supply live-config hooks as explained
 
 3~ Binary local hooks
 
-To run commands in the binary stage, create a hook script containing the commands in the #{config/binary_local-hooks}#. The hook will run after all other binary commands are run, but before binary_checksums, the very last binary commands The commands in your hook do not run in the chroot, so take care to not modify any files outside of the build tree, or you may damage your build system! See the example binary hook scripts for various common binary customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
+To run commands in the binary stage, create a hook script with a #{.binary}# suffix containing the commands in the #{config/hooks/}# directory. The hook will run after all other binary commands are run, but before binary_checksums, the very last binary command. The commands in your hook do not run in the chroot, so take care to not modify any files outside of the build tree, or you may damage your build system! See the example binary hook scripts for various common binary customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
 
 2~ Preseeding Debconf questions
 
-Files in the #{config/chroot_local-preseed}# directory are considered to be debconf preseed files and are installed by live-build using #{debconf-set-selections}#.
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}# followed by the stage (#{.chroot}# or #{.binary}#) are considered to be debconf preseed files and are installed by live-build using #{debconf-set-selections}# during the corresponding stage.
 
 For more information about debconf, please see debconf(7) in the #{debconf}# package.
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index f8b18f3..7daaa77 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -8,11 +8,14 @@ All configuration that is done during run time is done by live-config. Here are
 
 One important consideration is that the live user is created by live-boot at boot time, not by live-build at build time. This not only influences where materials relating to the live user are introduced in your build, as discussed in {Live/chroot local includes}#live-chroot-local-includes, but also any groups and permissions associated with the live user.
 
-You can specify additional groups that the live user will belong to by preseeding the #{passwd/user-default-groups}# debconf value. For example, to add the live user to the #{fuse}# group, add the following to a file in the #{config/chroot_local-preseed}# directory:
+You can specify additional groups that the live user will belong to by preseeding the #{passwd/user-default-groups}# debconf value. For example, to add the live user to the #{fuse}# group, add the following preseed under #{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 

-- 
live-manual