[SCM] Debian Live initramfs hook branch, master, updated. 1.139.1-3-14-gbb27306

[Chris Lamb]

The following commit has been merged in the master branch:
commit 33792255930d32a8cfab87558bc872cbb8a527de
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Oct 1 00:58:12 2008 +0100

    Reflow some grammar in comments and in live-initramfs(7).
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 5a7b979..bf0e332 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -341,7 +341,7 @@ Entry_is_modified ()
 
 Do_filelist ()
 {
-	# BUGS: supports only cpio.gz types, and do not handle deleted files yet
+	# BUGS: supports only cpio.gz types, and does not handle deleted files yet
 
 	TMP_FILELIST=$1
 	if [ -f "${SNAP_LIST}" ]
@@ -418,7 +418,8 @@ Do_snapshot ()
 			cd "${OLDPWD}"
 			;;
 
-		# ext2|ext3 and jffs2 does not support easely an exclude list, files should be copied in another directory in order to filter content
+		# ext2|ext3 and jffs2 does not easily support an exclude list; files
+		# should be copied to another directory in order to filter content
 		ext2|ext3)
 			DU_DIM="$(du -ks ${SNAP_COW} | cut -f1)"
 			REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here...
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 9766e21..799c1d7 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -204,9 +204,9 @@ live-initramfs will look for persistent and snapshot partitions or files labeled
 in order: mount as /cow the first, mount the second in /home, and just copy the
 contents of the latter in appropriate locations (snapshots). Snapshots will be
 tried to be updated on reboot/shutdown. Look at live-snapshot(1) for more
-informations. If "nofiles" is specified too, only labels will be searched and no
-filesystems will be mounted for searching file images or archives; this will
-results in improved boot times.
+informations. If "nofiles" is specified, only filesystems with matching labels
+will be searched; no filesystems will be traversed looking for snapshot files.
+This results in shorter boot times.
 
   {preseed/file|file}=**FILE**::
 
@@ -292,7 +292,14 @@ this file, any images in the "/live" directory are loaded in alphanumeric order.
 
  /etc/live-persistence.binds
 
-This optional file, which resides in the rootfs system, not in the live media as above mentioned files, if exists will be used as a list of directories which not need to be persistent and which their content does not need to survive reboots. This is achieved by bind mounting for each directory listed there a tmpfs on the original path. This will permits to save precious writes and speed up operations for content like web caches and temporary files (like e.g.  /tmp and .mozilla) which are regenerated each time.
+This optional file (which resides in the rootfs system, not in the live media)
+is used as a list of directories which not need be persistent: ie. their
+content does not need to survive reboots when using the persistence features.
+
+This saves expensive writes and speeds up operations on volatile data such as
+web caches and temporary files (like e.g. /tmp and .mozilla) which are
+regenerated each time. This is achieved by bind mounting each listed directory
+with a tmpfs on the original path.
 
 
 See also

-- 
Debian Live initramfs hook