Releasing debian version 3.0~a26-1.

VERSION

@@ -1 +1 @@
-3.0~a25-1
+3.0~a26-1

debian/changelog

@@ -1,3 +1,118 @@
+live-boot (3.0~a26-1) experimental; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating year in copyright.
+  * Updating copyright file machine-readable format version 1.0.
+  * Updating to standards version 3.9.3.
+  * Quoting noprompt variable in initscript to avoid syntax errors,
+    thanks to Philip Newborough <corenominal@corenominal.org>.
+  * Correcting log_end_msg usages in connection with verbosity checks in
+    live-boot initscript, thanks to Pablo Barbachano
+    <pablobarbachano@yahoo.es> (Closes: #665689).
+  * Replacing live-boot initscript with a stub and moving the actual
+    code to /lib/live/boot.sh to allow different initsystem support in
+    future.
+  * Removing some of the now useless sysvinit specifics from
+    bin/boot.sh.
+
+  [ Tails developers ]
+  * Adding initial work on a custom mounts system.
+
+  [ Daniel Baumann ]
+  * Correcting indenting initial work on a custom mounts system to
+    ensure consistency.
+  * Avoid calling rm without -f in initial work on a custom mounts
+    system to ensure non-interactivity.
+  * Avoid '==' bashism in initial work on a custom mounts system to
+    ensure posix compatiblity.
+
+  [ Tails developers ]
+  * Prevent custom mounting in /live.
+  * Optionally symlink files from persistent source instead of mount it.
+  * Separate overlay labels for full and custom persistence.
+  * Remove some temporary custom mount related files after they're used.
+
+  [ Daniel Baumann ]
+  * Calling rm without -f when removing some temporary custom mount
+    related files to ensure non-interactivity.
+
+  [ Tails developers ]
+  * Handle custom mounts options a bit more beautifully.
+  * Continue the correct for-loop so incorrect custom mount is skipped.
+  * Refactor union mounting into its own function.
+  * Workaround busybox's inability to detect symlinks with [ -e ].
+  * Make union mounting more sensible and robust.
+  * Ignore empty lines in live.persist.
+  * Remove the correct file.
+  * Optionally mount custom mounts as unions.
+  * Fix mask usage in links_files().
+
+  [ Daniel Baumann ]
+  * Correcting syntax when using if constructs in links_files().
+
+  [ Tails developers ]
+  * Refactor persistent custom mounting from live into live-helpers.
+  * Accept using several persistent media with custom-ov label.
+  * Use same device backing path as used in other places.
+  * Close unused LUKS devices in all cases.
+
+  [ Daniel Baumann ]
+  * Adjusting mount calls when using nfs options (Closes: #667435).
+
+  [ Tails developers ]
+  * Refactor live-boot argument parser from live into live-helpers.
+  * Refactor some global variables from live into live-helpers.
+  * Refactor find_persistent_media().
+  * Add support for probing partitions' GPT name just like filesystem
+    labels.
+  * Some minor cleanups.
+  * Handle already mounted devices and closing of unused luks devices
+    better.
+  * Add backwards compatibility for old labels: live-{rw,sn} and home-
+    rw.
+  * We don't black list storage devices any more.
+  * Check if luks device is already open before trying to open it.
+  * Fixup some style issues.
+  * Refactor mounting of persistent storage media.
+  * Cleanup.
+  * Remove two FIXME:s that are not really relevant.
+  * Don't allow . or .. in live.persist paths.
+  * Use trim_path when we compare paths.
+  * Make handling of LUKS encrypted GPT partitions more sane.
+  * Handle list arguments better in get_custom_mounts().
+  * Copy ownership/perms from source to rw-branch in read-only mode.
+  * Change live.persist syntax to "SOURCE [DEST [OPTIONS...]]".
+  * Refactor closing of persistent devices upon failure.
+  * Create the source dir for custom mounts using the 'linkfiles'
+    option.
+  * Fix ownership/perms for created union/linkfiles source dirs.
+  * Do not allow mutually exclusive custom mount options.
+  * Add a note about a potential, future code simplification.
+  * Greatly simplify live.persist syntax to "DIR [OPTIONS...]".
+  * Make trim_path() handle "/", and arbitrarily many consecutive /:es.
+  * Make two custom mounts with nested source directories illegal.
+  * Improve error message.
+  * Remove cow dir contents that are in the way for custom mounts.
+  * Also create parents when creating union/linkfiles source
+    directories.
+  * Update live-boot(7) man page and add new one for live.persist(5).
+  * Delete existing files in the destination's path when creating it.
+  * Adding functions equivalent to chmod/chown --reference.
+  * Fix ownership for links created for linkfiles custom mounts.
+  * Add 'bind' option for the default behaviour of custom mounts (bind-
+    mount).
+  * Use trim_path() instead of custom sed stanza to trim /:es from
+    paths.
+  * Copy perms/ownership from source when creating linkfiles dest dirs.
+  * Make cases for all different custom mounting situations more
+    explicit.
+
+  [ Daniel Baumann ]
+  * Correcting left-over in author section of live.persist manpage.
+  * Moving initscript to live-config.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 05 Apr 2012 08:14:51 +0200
+
 live-boot (3.0~a25-1) unstable; urgency=low
 
   [ Daniel Baumann ]

manpages/de/live-boot.de.7

@@ -3,14 +3,14 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 05.04.2012 3.0~a25\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
 
 .SH NAME
-\fBlive\-boot\fP \- System Boot Skripte
+\fBlive\-boot\fP \- System Boot Scripts
 
-.SH BESCHREIBUNG
-\fBlive\-config\fP enthaelt die Skripte welche ein Debian Live System waehrend
-des Startvorganes (early userspace) konfigurieren.
+.SH DESCRIPTION
+\fBlive\-boot\fP contains the scripts that configure a Debian Live system during
+the boot process (early userspace).
 .PP
 .\" FIXME
 live\-boot is a hook for the initramfs\-tools, used to generate a initramfs
@@ -24,27 +24,27 @@ directory where a root filesystems (often a compressed filesystem image like
 squashfs) is stored. If found, it will create a writable environment, using
 aufs, for Debian like systems to boot from.
 
-.SH KONFIGURATION
-\fBlive\-boot\fP kann durch Boot Parameter oder durch Konfigurationsdateien
-konfiguriert werden.
+.SH CONFIGURATION
+\fBlive\-boot\fP can be configured through a boot parameter or a configuration
+file.
 .PP
 To configure the live\-boot parameters used by default in a live image, see
 the \-\-bootappend\-live option in the \fIlb_config\fP(1) manual page.
 
-.SS "Kernel Parameter"
-\fBlive\-boot\fP ist nur dann aktiv, wenn 'boot=live' als Kernel Parameter
-benutzt wird.
+.SS "Kernel Parameters"
+\fBlive\-boot\fP is only activated if 'boot=live' was used as a kernel
+parameter.
 .PP
 In addition, there are some more boot parameters to influence the behaviour,
 see below.
 
-.SS Konfigurationsdateien
+.SS "Configuration Files"
 \fBlive\-boot\fP can be configured (but not activated) through configuration
 files. Those files can be placed either in the root filesystem itself
 (/etc/live/boot.conf, /etc/live/boot.d/), or on the live media
 (live/boot.conf, live/boot.d/).
 
-.SH OPTIONEN
+.SH OPTIONS
 .\" FIXME
 \fBlive\-boot\fP currently features the following parameters.
 .IP \fBaccess\fP=\fIACCESS\fP 4
@@ -278,17 +278,17 @@ 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.
 
-.SH DATEIEN
+.SH FILES
 .IP \fB/etc/live/boot.conf\fP 4
 .IP \fB/etc/live/boot.d/\fP 4
 .IP \fBlive/boot.conf\fP 4
 .IP \fBlive/boot.d/\fP 4
-.IP \fBlive.persistent\fP 4
+.IP \fBlive.persist\fP 4
 
-.SH "SIEHE AUCH"
+.SH "SEE ALSO"
 \fIlive\-snapshot\fP(1)
 .PP
-\fIlive.persist\fP(1)
+\fIlive.persist\fP(5)
 .PP
 \fIlive\-build\fP(7)
 .PP
@@ -297,17 +297,16 @@ directory with a tmpfs on the original path.
 \fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
-Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen
-auf der Homepage unter <\fIhttp://live.debian.net/\fP> und im Handbuch
-unter <\fIhttp://live.debian.net/manual/\fP> gefunden werden.
+More information about live\-boot and the Debian Live project can be found on
+the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
+<\fIhttp://live.debian.net/manual/\fP>.
 
-.SH FEHLER
-Fehler koennen durch Einreichen eines Fehlerberichtes fuer das live\-boot
-Paket im Debian Bug Tracking System unter
-<\fIhttp://bugs.debian.org/\fP> oder durch Senden einer E\-Mail an die
-Debian Live Mailing Liste unter <\fIdebian\-live@lists.debian.org\fP>
-(englischsprachig) mitgeteilt werden.
+.SH BUGS
+Bugs can be reported by submitting a bugreport for the live\-boot package in
+the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Debian Live mailing list at
+<\fIdebian\-live@lists.debian.org\fP>.
 
-.SH AUTOR
-live\-boot wurde von Daniel Baumann <\fIdaniel@debian.org\fP> fuer das
-Debian Projekt geschrieben.
+.SH AUTHOR
+live\-boot was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
+the Debian project.

manpages/de/live-snapshot.de.1

@@ -3,12 +3,12 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 05.04.2012 3.0~a25\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage
 
-.SH SYNTAX
+.SH SYNOPSIS
 \fBlive\-snapshot\fP [\-c|\-\-cow \fIDIRECTORY] [\-d|\-\-device DEVICE\fP]
 [\-e|\-\-exclude\-list \fIFILE\fP] [\-o|\-\-output \fIFILE\fP] [\-t|\-\-type \fITYPE\fP]
 .br
@@ -20,12 +20,12 @@
 .br
 \fBlive\-snapshot\fP [\-v|\-\-version]
 
-.SH BESCHREIBUNG
+.SH DESCRIPTION
 live\-snapshot is a script which can be used to build the right types of
 persistent image files supported by \fIlive\-boot\fP(7). It is also used on exit
 by the live\-boot init script to resync the boot\-found snapshots devices.
 
-.SH OPTIONEN
+.SH OPTIONS
 .IP "\-c, \-\-cow \fIDIRECTORY\fP" 4
 specifies the input directory to be cloned in the image file. Its default
 value "/live/cow" should be right for most uses. However it could be handy
@@ -60,7 +60,7 @@ show usage and exit.
 .IP "\-v, \-\-version" 4
 output version information and exit.
 
-.SH DATEIEN
+.SH FILES
 .IP \fB/etc/live.conf\fP 4
 Some variables can be configured via this config file (inside the live
 system).
@@ -89,7 +89,7 @@ files and directories listed there are included (integrally) in the
 snapshot. Beware, it is an experimental feature that only works for cpio
 targets now.
 
-.SH "SIEHE AUCH"
+.SH "SEE ALSO"
 \fIlive\-boot\fP(1)
 .PP
 \fIlive\-build\fP(7)
@@ -99,17 +99,16 @@ targets now.
 \fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
-Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen
-auf der Homepage unter <\fIhttp://live.debian.net/\fP> und im Handbuch
-unter <\fIhttp://live.debian.net/manual/\fP> gefunden werden.
+More information about live\-boot and the Debian Live project can be found on
+the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
+<\fIhttp://live.debian.net/manual/\fP>.
 
-.SH FEHLER
-Fehler koennen durch Einreichen eines Fehlerberichtes fuer das live\-boot
-Paket im Debian Bug Tracking System unter
-<\fIhttp://bugs.debian.org/\fP> oder durch Senden einer E\-Mail an die
-Debian Live Mailing Liste unter <\fIdebian\-live@lists.debian.org\fP>
-(englischsprachig) mitgeteilt werden.
+.SH BUGS
+Bugs can be reported by submitting a bugreport for the live\-boot package in
+the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Debian Live mailing list at
+<\fIdebian\-live@lists.debian.org\fP>.
 
-.SH AUTOR
-live\-boot wurde von Daniel Baumann <\fIdaniel@debian.org\fP> fuer das
-Debian Projekt geschrieben.
+.SH AUTHOR
+live\-boot was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
+the Debian project.

manpages/de/live.persist.5.de.persist

@@ -3,12 +3,12 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT persist 05.04.2012 3.0~a25\-1 "Debian Live Projekt"
+.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive.persist\fP \- Configuration file for persistent media in live\-boot
 
-.SH BESCHREIBUNG
+.SH DESCRIPTION
 If live\-boot probes a persistent volume with the label (or GPT name, or file
 name, but from now on we will just say "label") "custom\-ov", that volume's
 persistence is fully customizable through the \fBlive.persist\fP file stored on
@@ -55,7 +55,7 @@ bootstrapped by copying the contents of the \fIDIR\fP into its source directory
 on the persistent media. The bootstrapping will not happen when the
 \fBlinkfiles\fP or \fBunion\fP options are used (see below).
 
-.SH OPTIONEN
+.SH OPTIONS
 Custom mounts defined in \fBlive.persist\fP accept the following options in a
 coma\-separated list:
 .IP \fBsource\fP=\fIPATH\fP 4
@@ -184,7 +184,7 @@ system. Hence packages could be installed into /usr with great space\-wise
 efficiency compared to bind\-mounts, since in the latter case all of /usr
 would have to be copied into \fIVOL\fP/usr during the initial bootstrap.
 
-.SH "SIEHE AUCH"
+.SH "SEE ALSO"
 \fIlive\-boot\fP(7)
 .PP
 \fIlive\-build\fP(7)
@@ -194,17 +194,16 @@ would have to be copied into \fIVOL\fP/usr during the initial bootstrap.
 \fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
-Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen
-auf der Homepage unter <\fIhttp://live.debian.net/\fP> und im Handbuch
-unter <\fIhttp://live.debian.net/manual/\fP> gefunden werden.
+More information about live\-boot and the Debian Live project can be found on
+the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
+<\fIhttp://live.debian.net/manual/\fP>.
 
-.SH FEHLER
-Fehler koennen durch Einreichen eines Fehlerberichtes fuer das live\-boot
-Paket im Debian Bug Tracking System unter
-<\fIhttp://bugs.debian.org/\fP> oder durch Senden einer E\-Mail an die
-Debian Live Mailing Liste unter <\fIdebian\-live@lists.debian.org\fP>
-(englischsprachig) mitgeteilt werden.
+.SH BUGS
+Bugs can be reported by submitting a bugreport for the live\-boot package in
+the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
+writing a mail to the Debian Live mailing list at
+<\fIdebian\-live@lists.debian.org\fP>.
 
-.SH AUTOR
+.SH AUTHOR
 live.persist was written by anonym <\fIanonym@lavabit.com\fP> for the
 Debian project.

manpages/en/live-boot.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a25-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

manpages/en/live-snapshot.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a25-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage

manpages/en/live.persist.5

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a25-1 "Debian Live Project"
+.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26-1 "Debian Live Project"
 
 .SH NAME
 \fBlive.persist\fR \- Configuration file for persistent media in