Merge branch 'debian'

Conflicts:
	debian/control

diff --git a/VERSION b/VERSION
index 2e18714..8e06629 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.2-1
+5.0~a3-1

diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 76f4218..fc3d6b4 100755 (executable)
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -105,16 +105,9 @@ manual_add_modules squashfs
 manual_add_modules sqlzma
 manual_add_modules unlzma
 
-# Filesystem: aufs/overlayfs/unionfs
+# Filesystem: aufs/overlay
 manual_add_modules aufs
-manual_add_modules overlayfs
-manual_add_modules unionfs
-
-# Filesystem: unionfs-fuse
-if [ -x /usr/bin/unionfs-fuse ]
-then
-       copy_exec /usr/bin/unionfs-fuse /bin
-fi
+manual_add_modules overlay
 
 # Filesystem: vfat
 manual_add_modules nls_cp437

diff --git a/components/2010-remove-persistence b/components/2010-remove-persistence
new file mode 100755 (executable)
index 0000000..5dcf0c0
--- /dev/null
+++ b/components/2010-remove-persistence
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+#set -e
+
+Remove_persistence ()
+{
+       for _PARAMETER in ${LIVE_BOOT_CMDLINE}
+       do
+               case "${_PARAMETER}" in
+                       live-boot.persistence-remove=*|persistence-remove=*)
+                               LIVE_PERSISTENCE_REMOVE="${_PARAMETER#*persistence-remove=}"
+                               ;;
+
+                       live-boot.persistence-remove|persistence-remove)
+                               LIVE_PERSISTENCE_REMOVE="true"
+                               ;;
+               esac
+       done
+
+       case "${LIVE_PERSISTENCE_REMOVE}" in
+               true)
+                       ;;
+
+               *)
+                       return 0
+                       ;;
+       esac
+
+       # Remove persistence
+       cd /live/overlay && find . -not -name 'persistence.conf' | xargs rm -rf
+}

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index bdb7624..efb33c1 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -266,7 +266,7 @@ Cmdline_old ()
 
        if [ -z "${UNIONTYPE}" ]
        then
-               UNIONTYPE="aufs"
+               UNIONTYPE="overlay"
                export UNIONTYPE
        fi
 

diff --git a/components/9990-main.sh b/components/9990-main.sh
index 85b8a1d..512c624 100755 (executable)
--- a/components/9990-main.sh
+++ b/components/9990-main.sh
@@ -148,15 +148,6 @@ Live ()
 
        log_end_msg
 
-       # unionfs-fuse needs /dev to be bind-mounted for the duration of
-       # live-bottom; udev's init script will take care of things after that
-       case "${UNIONTYPE}" in
-               unionfs-fuse)
-                       mount -n -o bind /dev "${rootmnt}/dev"
-                       ;;
-       esac
-
-
        # aufs2 in kernel versions around 2.6.33 has a regression:
        # directories can't be accessed when read for the first the time,
        # causing a failure for example when accessing /var/lib/fai
@@ -201,12 +192,6 @@ Live ()
 
        Swap
 
-       case "${UNIONFS}" in
-               unionfs-fuse)
-                       umount "${rootmnt}/dev"
-                       ;;
-       esac
-
        exec 1>&6 6>&-
        exec 2>&7 7>&-
        kill ${tailpid}

diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
index fb139ec..9318a4b 100755 (executable)
--- a/components/9990-misc-helpers.sh
+++ b/components/9990-misc-helpers.sh
@@ -1292,23 +1292,8 @@ do_union ()
                        rw_opt="rw"
                        ro_opt="rr+wh"
                        noxino_opt="noxino"
-                       ;;
-
-               unionfs-fuse)
-                       rw_opt="RW"
-                       ro_opt="RO"
-                       ;;
 
-               *)
-                       rw_opt="rw"
-                       ro_opt="ro"
-                       ;;
-       esac
-
-       case "${UNIONTYPE}" in
-               unionfs-fuse)
-                       unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
-                       unionmountopts="${unionmountopts} ${unionrw}=${rw_opt}"
+                       unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}"
                        if [ -n "${unionro}" ]
                        then
                                for rofs in ${unionro}
@@ -1316,38 +1301,29 @@ do_union ()
                                        unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
                                done
                        fi
-                       ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
-                       unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-                       ( mkdir -p /run/sendsigs.omit.d
-                       pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
                        ;;
 
-               overlayfs)
-                       # XXX: can multiple unionro be used? (overlayfs only handles two dirs, but perhaps they can be chained?)
-                       # XXX: and can unionro be optional? i.e. can overlayfs skip lowerdir?
+               overlay)
+                       # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?)
+                       # XXX: and can unionro be optional? i.e. can overlay skip lowerdir?
                        if echo ${unionro} | grep -q " "
                        then
-                               panic "Multiple lower filesystems are currently not supported with overlayfs (unionro = ${unionro})."
+                               panic "Multiple lower filesystems are currently not supported with overlay (unionro = ${unionro})."
                        elif [ -z "${unionro}"  ]
                        then
-                               panic "Overlayfs needs at least one lower filesystem (read-only branch)."
-                       fi
-                       unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}"
-                       mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
-                       ;;
-
-               *)
-                       unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}"
-                       if [ -n "${unionro}" ]
-                       then
-                               for rofs in ${unionro}
-                               do
-                                       unionmountopts="${unionmountopts}:${rofs}=${ro_opt}"
-                               done
+                               panic "overlay needs at least one lower filesystem (read-only branch)."
                        fi
-                       mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
+                       # overlayfs requires:
+                       # + a workdir to become mounted
+                       # + workdir and upperdir to reside under the same mount
+                       # + workdir and upperdir to be in separate directories
+                       mkdir "${unionrw}/rw"
+                       mkdir "${unionrw}/work"
+                       unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work"
                        ;;
        esac
+
+       mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 }
 
 get_custom_mounts ()

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 52c045a..a64c78b 100755 (executable)
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -8,25 +8,12 @@ setup_unionfs ()
        rootmnt="${2}"
        addimage_directory="${3}"
 
-       case ${UNIONTYPE} in
-               aufs|unionfs|overlayfs)
-                       modprobe -q -b ${UNIONTYPE}
+       modprobe -q -b ${UNIONTYPE}
 
-                       if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ]
-                       then
-                               echo "${UNIONTYPE} not available, falling back to unionfs-fuse."
-                               echo "This might be really slow."
-
-                               UNIONTYPE="unionfs-fuse"
-                       fi
-                       ;;
-       esac
-
-       case "${UNIONTYPE}" in
-               unionfs-fuse)
-                       modprobe fuse
-                       ;;
-       esac
+       if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$"
+       then
+               panic "${UNIONTYPE} not available."
+       fi
 
        # run-init can't deal with images in a subdir, but we're going to
        # move all of these away before it runs anyway.  No, we're not,
@@ -123,22 +110,15 @@ setup_unionfs ()
                                                ;;
                                esac
 
-                               case "${UNIONTYPE}" in
-                                       unionmount)
-                                               mpoint="${rootmnt}"
-                                               rootfslist="${rootmnt} ${rootfslist}"
-                                               ;;
-
-                                       *)
-                                               mpoint="${croot}/${imagename}"
-                                               rootfslist="${mpoint} ${rootfslist}"
-                                               ;;
-                               esac
+                               mpoint="${croot}/${imagename}"
+                               rootfslist="${mpoint} ${rootfslist}"
 
                                mkdir -p "${mpoint}"
                                log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\""
                                mount -t "${fstype}" -o ro,noatime "${backdev}" "${mpoint}" || panic "Can not mount ${backdev} (${image}) on ${mpoint}"
                                log_end_msg
+                       else
+                               log_warning_msg "Could not find image '${image}'. Most likely it is listed in a .module file, perhaps by mistake."
                        fi
                done
        else
@@ -263,27 +243,24 @@ setup_unionfs ()
                cow_mountopt="rw,noatime,mode=755"
        fi
 
-       if [ "${UNIONTYPE}" != "unionmount" ]
+       if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
        then
-               if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
-               then
-                       mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay"
-                       root_backing="/live/persistence/$(basename ${cowdevice})-root"
-                       mkdir -p ${root_backing}
-               else
-                       root_backing="/live/overlay"
-               fi
+               mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay"
+               root_backing="/live/persistence/$(basename ${cowdevice})-root"
+               mkdir -p ${root_backing}
+       else
+               root_backing="/live/overlay"
+       fi
 
-               if [ "${cow_fstype}" = "nfs" ]
-               then
-                       log_begin_msg \
-                               "Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing}"
-                       nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing} || \
-                               panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${root_backing}"
-               else
-                       mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${root_backing} || \
-                               panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${root_backing}"
-               fi
+       if [ "${cow_fstype}" = "nfs" ]
+       then
+               log_begin_msg \
+                       "Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing}"
+               nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing} || \
+                       panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${root_backing}"
+       else
+               mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${root_backing} || \
+                       panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${root_backing}"
        fi
 
        rootfscount=$(echo ${rootfslist} |wc -w)
@@ -310,34 +287,23 @@ setup_unionfs ()
                cow_dirs="/"
        fi
 
-       if [ "${cow_fstype}" != "tmpfs" ] && [ "${cow_dirs}" != "/" ] && [ "${UNIONTYPE}" = "unionmount" ]
-       then
-               true # FIXME: Maybe it does, I don't really know.
-               #panic "unionmount does not support subunions (${cow_dirs})."
-       fi
-
        for dir in ${cow_dirs}; do
                unionmountpoint="${rootmnt}${dir}"
                mkdir -p ${unionmountpoint}
-               if [ "${UNIONTYPE}" = "unionmount" ]
+               cow_dir="/live/overlay${dir}"
+               rootfs_dir="${rootfs}${dir}"
+               mkdir -p ${cow_dir}
+               if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
                then
-                       # FIXME: handle PERSISTENCE_READONLY
-                       unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
-                       # unionmount only works with util-linux mount
-                       mount.util-linux $unionmountopts "${unionmountpoint}"
+                       do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir}
                else
-                       cow_dir="/live/overlay${dir}"
-                       rootfs_dir="${rootfs}${dir}"
-                       mkdir -p ${cow_dir}
-                       if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
-                       then
-                               do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir}
-                       else
-                               do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir}
-                       fi
+                       do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir}
                fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
        done
 
+       # Remove persistence depending on boot parameter
+       Remove_persistence
+
        # Correct the permissions of /:
        chmod 0755 "${rootmnt}"
 
@@ -358,15 +324,7 @@ setup_unionfs ()
                                # do nothing # mount -o bind "${d}" "${live_rootfs}"
                                ;;
                        *)
-                               case "${UNIONTYPE}" in
-                                       unionfs-fuse)
-                                               mount -o bind "${d}" "${live_rootfs}"
-                                               ;;
-
-                                       *)
-                                               mount -o move "${d}" "${live_rootfs}"
-                                               ;;
-                               esac
+                               mount -o move "${d}" "${live_rootfs}"
                                ;;
                esac
        done

diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh
index 7d1aa16..df00666 100755 (executable)
--- a/components/9990-select-eth-device.sh
+++ b/components/9990-select-eth-device.sh
@@ -24,6 +24,10 @@ Select_eth_device ()
        # we want to do some basic IP
        modprobe -q af_packet
 
+       # Ensure all our net modules get loaded so we can actually compare MAC addresses...
+       udevadm trigger
+       udevadm settle
+
        # Available Ethernet interfaces ?
        l_interfaces=""
 

diff --git a/debian/changelog b/debian/changelog
index 4e75b97..cc0b229 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,72 @@
+live-boot (5.0~a4-1) unstable; urgency=low
+
+  [ Tails developers ]
+  * Logging a warning when an expected image file is missing.
+  * Patch by Steven Shiau <steven@nchc.org.tw>. The only changes so far
+    are:
+  * Removing attempt to mount overlayfs in an obsolete way.
+  * Cleaning up comment to keep only the part that's relevant here.
+  * Adding missing quotes.
+  * Removing obsolete code.
+  * Refactoring duplicate identical call to mount.
+
+  [ Daniel Baumann ]
+  * Switching default union filesystem to overlay, wheezy systems can use
+    union=aufs for the time being.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 17 May 2015 21:04:01 +0200
+
+live-boot (5.0~a3-1) unstable; urgency=low
+
+  [ Tails developers ]
+  * Patch by Steven Shiau <steven@nchc.org.tw>. The only changes so far
+    are:
+  * Removing attempt to mount overlayfs in an obsolete way.
+  * Cleaning up comment to keep only the part that's relevant here.
+  * Adding missing quotes.
+  * Removing obsolete code.
+  * Removing unused variables.
+  * Refactoring duplicate identical call to mount.
+
+  [ Daniel Baumann ]
+  * Waiting until all ethernet devices are up on multi-nic machines,
+    thanks to Chris Read <chris.read@gmail.com> (Closes: #744777).
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Tue, 28 Apr 2015 07:19:16 +0200
+
+live-boot (5.0~a2-1) unstable; urgency=low
+
+  [ Tom Jampen ]
+  * Adding command line parameter to remove persistence.
+
+  [ Gaudenz Steinlin ]
+  * Modprobe filesystem modules before checking support.
+
+  [ victory ]
+  * Unfuzzy Japanese translation.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 26 Apr 2015 20:11:46 +0200
+
+live-boot (5.0~a1-1) experimental; urgency=low
+
+  [ Tails developers ]
+  * Fixing name of overlayfs kernel module for inclusion in the initramfs
+    (Closes: #773868).
+
+  [ Daniel Baumann ]
+  * Using 'overlay' instead of 'overlayfs' everywhere, without backwards
+    compatibility (Closes: #773881).
+  * Dropping unionfs-fuse support:
+  * Dropping unionfs support, long superseeded with aufs.
+  * Dropping unionmount support, superseeded with overlay in mainline
+    kernel.
+  * Updating manpages for union= boot parameter.
+  * Simplifying code a bit after removal of no longer supported overlay
+    alternatives.
+  * Updating year in copyright notices to 2015.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 04 Jan 2015 21:50:28 +0100
+
 live-boot (4.0.2-1) unstable; urgency=low
 
   [ Daniel Baumann ]

diff --git a/debian/control b/debian/control
index ab8779a..54a98f6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,25 @@ Bugs: mailto:bugs@grml.org
 
 Package: live-boot-grml
 Architecture: all
-Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
-Recommends: live-boot-grml-doc, live-tools, eject, file, rsync, uuid-runtime
+Depends:
+ ${misc:Depends},
+ live-boot-grml-initramfs-tools | live-boot-backend,
+ genext2fs,
+Recommends:
+ live-boot-grml-doc,
+ live-tools,
+ eject,
+ file,
+ rsync,
+ uuid-runtime,
+Suggests:
+ curlftpfs,
+ cryptsetup,
+ httpfs2,
+ wget,
 Conflicts: live-boot
 Replaces: live-boot
 Provides: live-boot
-Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
 Description: Live System Boot Components
  live-boot contains the components to configure a live system during the boot
  process (early userspace).

diff --git a/debian/copyright b/debian/copyright
index eabae2a..90f0fcc 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Live Systems Project <debian-live@lists.debian.org>
 Source: http://live-systems.org/archive/packages/live-boot/
 
 Files: *
-Copyright: 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
+Copyright: 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
            2005-2008 Canonical Ltd. <http://www.cannonical.com/>
            2008 Chris Lamb <chris@debian.org>
            2006-2007 Marco Amadori <marco.amadori@gmail.com>

diff --git a/debian/live-boot-grml.bug-script b/debian/live-boot-grml.bug-script
index e3f6d36..063ead8 100644 (file)
--- a/debian/live-boot-grml.bug-script
+++ b/debian/live-boot-grml.bug-script
@@ -7,7 +7,7 @@ dpkg -l busybox busybox-initramfs initramfs-tools udev
 dpkg -l rsync uuid-runtime
 
 # Checking suggests
-dpkg -l curlftpfs cryptsetup httpfs2 unionfs-fuse wget
+dpkg -l curlftpfs cryptsetup httpfs2 wget
 
 # Checking other packages
 dpkg -l plymouth

diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index dc58a25..bfa6fbb 100755 (executable)
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-boot(7) - System Boot Components
-## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
+## Copyright (C) 2006-2015 Daniel Baumann <mail@daniel-baumann.ch>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -35,8 +35,8 @@ do
        then
                for _FILE in po/${_LANGUAGE}/*.po
                do
-                       sed -i  -e "s|^msgstr .*.2014-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
-                               -e "s|^msgstr .*.2014\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+                       sed -i  -e "s|^msgstr .*.2015-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+                               -e "s|^msgstr .*.2015\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
                        "${_FILE}"
                done
        fi
@@ -47,8 +47,8 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
 then
        for _FILE in po/pt_BR/*.po
        do
-               sed -i  -e "s|^msgstr .*.2014-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
-                       -e "s|^msgstr .*-2014\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+               sed -i  -e "s|^msgstr .*.2015-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+                       -e "s|^msgstr .*-2015\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
                "${_FILE}"
        done
 fi

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index eb6aa27..87f645c 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Components
@@ -132,8 +132,8 @@ If you boot with the normal quiet parameter, live\-boot hides most messages of i
 Adding this parameter, live\-boot will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live\-media=DEVICE" boot parameter with the same DEVICE used this time.
 .IP "\fBtoram\fR" 4
 Adding this parameter, live\-boot will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media.
-.IP "\fBunion\fR=aufs|unionfs\fR" 4
-By default, live\-boot uses aufs. With this parameter, you can switch to unionfs.
+.IP "\fBunion\fR=aufs|overlay\fR" 4
+By default, live\-boot uses aufs. With this parameter, you can switch to overlay.
 .\" FIXME
 
 .\" FIXME

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 297a624..edf6591 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2015\-04\-28 5.0~a3-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in
@@ -96,8 +96,7 @@ read-only media. One caveat is that the union will use \fIDIR\fR from
 the image's read-only file system, not the real file system root, so
 files created after boot (e.g. by live-config) will not appear in the
 union. This option will use the union file system specified by
-live-boot's \fBunion\fR boot parameter, but is not supported with
-\fBunion=unionmount\fR.
+live-boot's \fBunion\fR boot parameter.
 
 .SH DIRECTORIES
 .IP "\fB/live/persistence\fR" 4

diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index f83ce79..c49ad74 100644 (file)
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Componentes de Arranque del Sistema
@@ -248,10 +248,10 @@ Al añadir este parámetro, live\-boot trata de copiar los medios de sólo
 lectura enteros en la memoria RAM del ordenador antes de montar el sistema
 de ficheros raíz. Para esto puede ser necesaria mucha memoria RAM, según el
 espacio utilizado por los medios de sólo lectura.
-.IP \fBunion\fP=aufs|unionfs 4
+.IP \fBunion\fP=aufs|overlay 4
 .\" FIXME
 Por defecto, live\-boot usa aufs. Con este parámetro, se puede cambiar a
-unionfs.
+overlay.
 
 .\" FIXME
 .SH "FICHEROS (antiguos)"

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index 46e7378..f612719 100644 (file)
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2015\-04\-28 5.0~a3\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
@@ -106,8 +106,7 @@ es que la unión utilizará el \fIDIR\fP del sistema de ficheros de sólo lectur
 de la imagen y no de la raíz del sistema de ficheros real, por eso los
 ficheros que se crean después del arranque (por ejemplo live\-config) no
 aparecerán en la unión. Esta opción utilizará el sistema de ficheros unión
-especificado por el parámetro de arranque \fBunion\fP de live\-boot pero no
-tiene soporte si se utiliza \fBunion=unionmount\fP.
+especificado por el parámetro de arranque \fBunion\fP de live\-boot.
 
 .SH DIRECTORIOS
 .IP \fB/live/persistence\fP 4

diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7
index 8bcd142..c4605b4 100644 (file)
--- a/manpages/ja/live-boot.ja.7
+++ b/manpages/ja/live-boot.ja.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBlive\-boot\fP \- システム起動構成要素
@@ -183,9 +183,9 @@ live\-boot
 .IP \fBtoram\fP 4
 このパラメータを追加すると、live\-boot はルートファイルシステムをマウントする前に読み取り専用メディア全体をそのコンピュータの RAM
 にコピーしようとします。その読み取り専用メディアで利用している容量により、これには多くの RAM が必要となるかもしれません。
-.IP \fBunion\fP=aufs|unionfs 4
+.IP \fBunion\fP=aufs|overlay 4
 .\" FIXME
-デフォルトで live\-boot は aufs を利用します。このパラメータにより unionfs に切り替えることができます。
+デフォルトで live\-boot は aufs を利用します。このパラメータにより overlay に切り替えることができます。
 
 .\" FIXME
 .SH "ファイル (古い情報)"

diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5
index 9a2c482..632f5e3 100644 (file)
--- a/manpages/ja/persistence.conf.ja.5
+++ b/manpages/ja/persistence.conf.ja.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT conf 2015\-04\-28 5.0~a3\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル
@@ -55,7 +55,7 @@ live\-boot が「persistence」というラベル (GPT の名前やファイル
 結合ファイルシステムの rw
 ブランチを保持用メディアに保存するため、変更点だけを持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク使用量を減らせる可能性があり、また読み取り専用メディアに追加したファイルを隠しません。1つ注意があり、結合後に実際のファイルシステムのルートではなくイメージの読み取り専用ファイルシステムから\fIディレクトリ\fPを使うため、(例えば
 live\-config により) ブート後に作成されたファイルは結合後には見えなくなります。このオプションは live\-boot の \fBunion\fP
-ã\83\96ã\83¼ã\83\88ã\83\91ã\83©ã\83¡ã\83¼ã\82¿ã\81«ã\82\88ã\82\8aæ\8c\87å®\9aã\81\95ã\82\8cã\81\9fçµ\90å\90\88ã\83\95ã\82¡ã\82¤ã\83«ã\82·ã\82¹ã\83\86ã\83 ã\82\92使ã\81\84ã\81¾ã\81\99ã\81\8cã\80\81\fBunion=unionmount\fP ã\81§ã\81¯ã\82µã\83\9dã\83¼ã\83\88ã\81\97ã\81¦ã\81\84ã\81¾ã\81\9bã\82\93ã\80\82
+ブートパラメータにより指定された結合ファイルシステムを使います。
 
 .SH ディレクトリ
 .IP \fB/live/persistence\fP 4

diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index e88e9f8..8aeb7a4 100644 (file)
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-04-28 07:19+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,13 +25,13 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-04-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0.2-1"
+msgid "5.0~a3-1"
 msgstr ""
 
 #. type: TH
@@ -901,18 +901,18 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:135
 #, no-wrap
-msgid "B<union>=aufs|unionfs"
-msgstr "B<union>=aufs|unionfs"
+msgid "B<union>=aufs|overlay"
+msgstr "B<union>=aufs|overlay"
 
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
-"unionfs."
+"overlay."
 msgstr ""
 "Por defecto, live-boot usa aufs. Con este parámetro, se puede cambiar a "
-"unionfs."
+"overlay."
 
 #.  FIXME
 #. type: SH
@@ -1002,7 +1002,7 @@ msgid "B<persistence.conf>"
 msgstr "B<persistence.conf>"
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER ADEMÁS"
@@ -1013,28 +1013,28 @@ msgid "I<persistence.conf>(5)"
 msgstr "I<persistence.conf>(5)"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -1045,13 +1045,13 @@ msgstr ""
 "manual en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -1064,13 +1064,13 @@ msgstr ""
 "Systems a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index 81afe76..ed72e2e 100644 (file)
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-04-28 07:19+0200\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-04-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0.2-1"
+msgid "5.0~a3-1"
 msgstr ""
 
 #. type: TH
@@ -57,34 +57,34 @@ msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER ADEMÁS"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -95,13 +95,13 @@ msgstr ""
 "manual en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -114,13 +114,13 @@ msgstr ""
 "Systems a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -357,7 +357,7 @@ msgid "B<union>"
 msgstr "B<union>"
 
 #. type: Plain text
-#: en/persistence.conf.5:101
+#: en/persistence.conf.5:100
 msgid ""
 "Save the rw branch of a union on the persistence media, so only the changes "
 "are stored persistently. This can potentially reduce disk usage compared to "
@@ -365,8 +365,7 @@ msgid ""
 "caveat is that the union will use I<DIR> from the image's read-only file "
 "system, not the real file system root, so files created after boot (e.g. by "
 "live-config) will not appear in the union. This option will use the union "
-"file system specified by live-boot's B<union> boot parameter, but is not "
-"supported with B<union=unionmount>."
+"file system specified by live-boot's B<union> boot parameter."
 msgstr ""
 "Guardar la rama rw de una unión en un medio persistente, de modo que los "
 "cambios son guardados de forma persistente. Potencialmente esto puede "
@@ -376,23 +375,22 @@ msgstr ""
 "de la imagen y no de la raíz del sistema de ficheros real, por eso los "
 "ficheros que se crean después del arranque (por ejemplo live-config) no "
 "aparecerán en la unión. Esta opción utilizará el sistema de ficheros unión "
-"especificado por el parámetro de arranque B<union> de live-boot pero no "
-"tiene soporte si se utiliza B<union=unionmount>."
+"especificado por el parámetro de arranque B<union> de live-boot."
 
 #. type: SH
-#: en/persistence.conf.5:102
+#: en/persistence.conf.5:101
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr "DIRECTORIOS"
 
 #. type: IP
-#: en/persistence.conf.5:103
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr "B</live/persistence>"
 
 #. type: Plain text
-#: en/persistence.conf.5:109
+#: en/persistence.conf.5:108
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
 "to the device name). The B<persistence.conf> file can easily be edited "
@@ -406,13 +404,13 @@ msgstr ""
 "personalizados usando la opción B<link>)."
 
 #. type: SH
-#: en/persistence.conf.5:110
+#: en/persistence.conf.5:109
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
 
 #. type: Plain text
-#: en/persistence.conf.5:115
+#: en/persistence.conf.5:114
 msgid ""
 "Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> "
 "file containing the following four lines (numbered for ease of reference):"
@@ -422,56 +420,56 @@ msgstr ""
 "referencia):"
 
 #. type: TP
-#: en/persistence.conf.5:115 en/persistence.conf.5:129
+#: en/persistence.conf.5:114 en/persistence.conf.5:128
 #, no-wrap
 msgid "1."
 msgstr "1."
 
 #. type: Plain text
-#: en/persistence.conf.5:118
+#: en/persistence.conf.5:117
 msgid "/home/user1 link,source=config-files/user1"
 msgstr "/home/user1 link,source=config-files/user1"
 
 #. type: TP
-#: en/persistence.conf.5:118 en/persistence.conf.5:133
+#: en/persistence.conf.5:117 en/persistence.conf.5:132
 #, no-wrap
 msgid "2."
 msgstr "2."
 
 #. type: Plain text
-#: en/persistence.conf.5:121
+#: en/persistence.conf.5:120
 msgid "/home/user2 link,source=config-files/user2"
 msgstr "/home/user2 link,source=config-files/user2"
 
 #. type: TP
-#: en/persistence.conf.5:121 en/persistence.conf.5:137
+#: en/persistence.conf.5:120 en/persistence.conf.5:136
 #, no-wrap
 msgid "3."
 msgstr "3."
 
 #. type: Plain text
-#: en/persistence.conf.5:124
+#: en/persistence.conf.5:123
 msgid "/home"
 msgstr "/home"
 
 #. type: TP
-#: en/persistence.conf.5:124 en/persistence.conf.5:140
+#: en/persistence.conf.5:123 en/persistence.conf.5:139
 #, no-wrap
 msgid "4."
 msgstr "4."
 
 #. type: Plain text
-#: en/persistence.conf.5:127
+#: en/persistence.conf.5:126
 msgid "/usr union"
 msgstr "/usr union"
 
 #. type: Plain text
-#: en/persistence.conf.5:129
+#: en/persistence.conf.5:128
 msgid "The corresponding source directories are:"
 msgstr "Los directorios de origen correspondientes son:"
 
 #. type: Plain text
-#: en/persistence.conf.5:133
+#: en/persistence.conf.5:132
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
@@ -480,7 +478,7 @@ msgstr ""
 "B<source>)"
 
 #. type: Plain text
-#: en/persistence.conf.5:137
+#: en/persistence.conf.5:136
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
@@ -489,17 +487,17 @@ msgstr ""
 "B<source>)"
 
 #. type: Plain text
-#: en/persistence.conf.5:140
+#: en/persistence.conf.5:139
 msgid "I<VOL>/home"
 msgstr "I<VOL>/home"
 
 #. type: Plain text
-#: en/persistence.conf.5:143
+#: en/persistence.conf.5:142
 msgid "I<VOL>/usr"
 msgstr "I<VOL>/usr"
 
 #. type: Plain text
-#: en/persistence.conf.5:146
+#: en/persistence.conf.5:145
 msgid ""
 "It was necessary to set the B<source> options for 1 and 2, since they "
 "otherwise would become nested with 3's source, which is invalid."
@@ -508,7 +506,7 @@ msgstr ""
 "modo resultarían anidados con el origen de 3, lo cual no es válido."
 
 #. type: Plain text
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 msgid ""
 "Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
 "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -522,80 +520,80 @@ msgstr ""
 "ficheros existen: "
 
 #. type: TP
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 #, no-wrap
 msgid "a."
 msgstr "a."
 
 #. type: Plain text
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr "I<VOL>/config-files/user1/.emacs"
 
 #. type: TP
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 #, no-wrap
 msgid "b."
 msgstr "b."
 
 #. type: Plain text
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr "I<VOL>/config-files/user2/.bashrc"
 
 #. type: TP
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 #, no-wrap
 msgid "c."
 msgstr "c."
 
 #. type: Plain text
-#: en/persistence.conf.5:160
+#: en/persistence.conf.5:159
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr "I<VOL>/config-files/user2/.ssh/config"
 
 #. type: Plain text
-#: en/persistence.conf.5:162
+#: en/persistence.conf.5:161
 msgid "Then the following links and directories will be created:"
 msgstr "Entonces se crearán los siguientes enlaces y directorios:"
 
 #. type: TP
-#: en/persistence.conf.5:162 en/persistence.conf.5:165
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:161 en/persistence.conf.5:164
+#: en/persistence.conf.5:170
 #, no-wrap
 msgid "Link:"
 msgstr "Enlace:"
 
 #. type: Plain text
-#: en/persistence.conf.5:165
+#: en/persistence.conf.5:164
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (de a)"
 
 #. type: Plain text
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (de b)"
 
 #. type: TP
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 #, no-wrap
 msgid "Dir:"
 msgstr "Directorio:"
 
 #. type: Plain text
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:170
 msgid "/homea/user2/.ssh (from c)"
 msgstr "/homea/user2/.ssh (de c)"
 
 #. type: Plain text
-#: en/persistence.conf.5:175
+#: en/persistence.conf.5:174
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (de c)"
 
 #. type: Plain text
-#: en/persistence.conf.5:181
+#: en/persistence.conf.5:180
 msgid ""
 "One could argue, though, that lines 1 and 2 in the example B<persistence."
 "conf> file above are unnecessary since line 3 already would make all of /"
@@ -611,7 +609,7 @@ msgstr ""
 "incluidos en él."
 
 #. type: Plain text
-#: en/persistence.conf.5:190
+#: en/persistence.conf.5:189
 msgid ""
 "Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
 "completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -631,6 +629,6 @@ msgstr ""
 "tendría que ser copiado en I<VOL>/usr durante la preinstalación inicial."
 
 #. type: Plain text
-#: en/persistence.conf.5:193
+#: en/persistence.conf.5:192
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"

diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po
index 8906674..1b77c20 100644 (file)
--- a/manpages/po/ja/live-boot.7.po
+++ b/manpages/po/ja/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-04-28 07:19+0200\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -22,15 +22,15 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "2014-12-10"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "2015-04-28"
+msgstr "2015-01-04"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "4.0.2-1"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "5.0~a3-1"
+msgstr "5.0~a1-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -885,17 +885,17 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:135
 #, no-wrap
-msgid "B<union>=aufs|unionfs"
-msgstr "B<union>=aufs|unionfs"
+msgid "B<union>=aufs|overlay"
+msgstr "B<union>=aufs|overlay"
 
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
-"unionfs."
+"overlay."
 msgstr ""
-"デフォルトで live-boot は aufs を利用します。このパラメータにより unionfs に"
+"デフォルトで live-boot は aufs を利用します。このパラメータにより overlay に"
 "切り替えることができます。"
 
 #.  FIXME
@@ -982,7 +982,7 @@ msgid "B<persistence.conf>"
 msgstr "B<persistence.conf>"
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
@@ -993,28 +993,28 @@ msgid "I<persistence.conf>(5)"
 msgstr "I<persistence.conf>(5)"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -1025,13 +1025,13 @@ msgstr ""
 "systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -1044,13 +1044,13 @@ msgstr ""
 "報告できます。"
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""

diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po
index 62c3c63..e274bcf 100644 (file)
--- a/manpages/po/ja/persistence.conf.5.po
+++ b/manpages/po/ja/persistence.conf.5.po
@@ -1,12 +1,12 @@
 # Japanese translations for live-boot package
-# Copyright (C) 2013-2014 victory <victory.deb@gmail.com>
+# Copyright (C) 2013-2015 victory <victory.deb@gmail.com>
 # This file is distributed under the same license as the live-boot package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
-"PO-Revision-Date: 2014-08-28 02:52+0900\n"
+"POT-Creation-Date: 2015-04-28 07:19+0200\n"
+"PO-Revision-Date: 2015-01-05 05:50+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -22,15 +22,15 @@ msgstr "LIVE-BOOT"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "2014-12-10"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "2015-04-28"
+msgstr "2015-01-04"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
-#, no-wrap
-msgid "4.0.2-1"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "5.0~a3-1"
+msgstr "5.0~a1-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -57,34 +57,34 @@ msgid "OPTIONS"
 msgstr "オプション"
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -95,13 +95,13 @@ msgstr ""
 "systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -114,13 +114,13 @@ msgstr ""
 "報告できます。"
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -342,7 +342,7 @@ msgid "B<union>"
 msgstr "B<union>"
 
 #. type: Plain text
-#: en/persistence.conf.5:101
+#: en/persistence.conf.5:100
 msgid ""
 "Save the rw branch of a union on the persistence media, so only the changes "
 "are stored persistently. This can potentially reduce disk usage compared to "
@@ -350,8 +350,7 @@ msgid ""
 "caveat is that the union will use I<DIR> from the image's read-only file "
 "system, not the real file system root, so files created after boot (e.g. by "
 "live-config) will not appear in the union. This option will use the union "
-"file system specified by live-boot's B<union> boot parameter, but is not "
-"supported with B<union=unionmount>."
+"file system specified by live-boot's B<union> boot parameter."
 msgstr ""
 "結合ファイルシステムの rw ブランチを保持用メディアに保存するため、変更点だけ"
 "を持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク"
@@ -360,22 +359,22 @@ msgstr ""
 "ジの読み取り専用ファイルシステムからI<ディレクトリ>を使うため、(例えば live-"
 "config により) ブート後に作成されたファイルは結合後には見えなくなります。この"
 "オプションは live-boot の B<union> ブートパラメータにより指定された結合ファイ"
-"ã\83«ã\82·ã\82¹ã\83\86ã\83 ã\82\92使ã\81\84ã\81¾ã\81\99ã\81\8cã\80\81B<union=unionmount> ã\81§ã\81¯ã\82µã\83\9dã\83¼ã\83\88ã\81\97ã\81¦ã\81\84ã\81¾ã\81\9bã\82\93ã\80\82"
+"ルシステムを使います。"
 
 #. type: SH
-#: en/persistence.conf.5:102
+#: en/persistence.conf.5:101
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr "ディレクトリ"
 
 #. type: IP
-#: en/persistence.conf.5:103
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr "B</live/persistence>"
 
 #. type: Plain text
-#: en/persistence.conf.5:109
+#: en/persistence.conf.5:108
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
 "to the device name). The B<persistence.conf> file can easily be edited "
@@ -388,13 +387,13 @@ msgstr ""
 "集できます。"
 
 #. type: SH
-#: en/persistence.conf.5:110
+#: en/persistence.conf.5:109
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "例"
 
 #. type: Plain text
-#: en/persistence.conf.5:115
+#: en/persistence.conf.5:114
 msgid ""
 "Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> "
 "file containing the following four lines (numbered for ease of reference):"
@@ -403,56 +402,56 @@ msgstr ""
 "を収録しているものとしましょう (番号は参照しやすいように付加しています):"
 
 #. type: TP
-#: en/persistence.conf.5:115 en/persistence.conf.5:129
+#: en/persistence.conf.5:114 en/persistence.conf.5:128
 #, no-wrap
 msgid "1."
 msgstr "1."
 
 #. type: Plain text
-#: en/persistence.conf.5:118
+#: en/persistence.conf.5:117
 msgid "/home/user1 link,source=config-files/user1"
 msgstr "/home/user1 link,source=config-files/user1"
 
 #. type: TP
-#: en/persistence.conf.5:118 en/persistence.conf.5:133
+#: en/persistence.conf.5:117 en/persistence.conf.5:132
 #, no-wrap
 msgid "2."
 msgstr "2."
 
 #. type: Plain text
-#: en/persistence.conf.5:121
+#: en/persistence.conf.5:120
 msgid "/home/user2 link,source=config-files/user2"
 msgstr "/home/user2 link,source=config-files/user2"
 
 #. type: TP
-#: en/persistence.conf.5:121 en/persistence.conf.5:137
+#: en/persistence.conf.5:120 en/persistence.conf.5:136
 #, no-wrap
 msgid "3."
 msgstr "3."
 
 #. type: Plain text
-#: en/persistence.conf.5:124
+#: en/persistence.conf.5:123
 msgid "/home"
 msgstr "/home"
 
 #. type: TP
-#: en/persistence.conf.5:124 en/persistence.conf.5:140
+#: en/persistence.conf.5:123 en/persistence.conf.5:139
 #, no-wrap
 msgid "4."
 msgstr "4."
 
 #. type: Plain text
-#: en/persistence.conf.5:127
+#: en/persistence.conf.5:126
 msgid "/usr union"
 msgstr "/usr union"
 
 #. type: Plain text
-#: en/persistence.conf.5:129
+#: en/persistence.conf.5:128
 msgid "The corresponding source directories are:"
 msgstr "それぞれに対応するディレクトリ:"
 
 #. type: Plain text
-#: en/persistence.conf.5:133
+#: en/persistence.conf.5:132
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
@@ -461,7 +460,7 @@ msgstr ""
 "I<VOL>/home/user1)"
 
 #. type: Plain text
-#: en/persistence.conf.5:137
+#: en/persistence.conf.5:136
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
@@ -470,17 +469,17 @@ msgstr ""
 "I<VOL>/home/user2)"
 
 #. type: Plain text
-#: en/persistence.conf.5:140
+#: en/persistence.conf.5:139
 msgid "I<VOL>/home"
 msgstr "I<VOL>/home"
 
 #. type: Plain text
-#: en/persistence.conf.5:143
+#: en/persistence.conf.5:142
 msgid "I<VOL>/usr"
 msgstr "I<VOL>/usr"
 
 #. type: Plain text
-#: en/persistence.conf.5:146
+#: en/persistence.conf.5:145
 msgid ""
 "It was necessary to set the B<source> options for 1 and 2, since they "
 "otherwise would become nested with 3's source, which is invalid."
@@ -489,7 +488,7 @@ msgstr ""
 "ソースと入り組んでしまい不正となるためです。"
 
 #. type: Plain text
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 msgid ""
 "Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
 "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -502,74 +501,74 @@ msgstr ""
 "明するため、以下のファイルが存在するとしましょう:"
 
 #. type: TP
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 #, no-wrap
 msgid "a."
 msgstr "a."
 
 #. type: Plain text
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr "I<VOL>/config-files/user1/.emacs"
 
 #. type: TP
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 #, no-wrap
 msgid "b."
 msgstr "b."
 
 #. type: Plain text
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr "I<VOL>/config-files/user2/.bashrc"
 
 #. type: TP
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 #, no-wrap
 msgid "c."
 msgstr "c."
 
 #. type: Plain text
-#: en/persistence.conf.5:160
+#: en/persistence.conf.5:159
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr "I<VOL>/config-files/user2/.ssh/config"
 
 #. type: Plain text
-#: en/persistence.conf.5:162
+#: en/persistence.conf.5:161
 msgid "Then the following links and directories will be created:"
 msgstr "それにより作成されるリンクやディレクトリ:"
 
 #. type: TP
-#: en/persistence.conf.5:162 en/persistence.conf.5:165
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:161 en/persistence.conf.5:164
+#: en/persistence.conf.5:170
 #, no-wrap
 msgid "Link:"
 msgstr "リンク:"
 
 #. type: Plain text
-#: en/persistence.conf.5:165
+#: en/persistence.conf.5:164
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (a の場合)"
 
 #. type: Plain text
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr ""
 "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (b の場合)"
 
 #. type: TP
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 #, no-wrap
 msgid "Dir:"
 msgstr "ディレクトリ:"
 
 #. type: Plain text
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:170
 msgid "/homea/user2/.ssh (from c)"
 msgstr "/homea/user2/.ssh (c の場合)"
 
 #. type: Plain text
-#: en/persistence.conf.5:175
+#: en/persistence.conf.5:174
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
@@ -577,7 +576,7 @@ msgstr ""
 "合)"
 
 #. type: Plain text
-#: en/persistence.conf.5:181
+#: en/persistence.conf.5:180
 msgid ""
 "One could argue, though, that lines 1 and 2 in the example B<persistence."
 "conf> file above are unnecessary since line 3 already would make all of /"
@@ -592,7 +591,7 @@ msgstr ""
 "ます。"
 
 #. type: Plain text
-#: en/persistence.conf.5:190
+#: en/persistence.conf.5:189
 msgid ""
 "Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
 "completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -611,6 +610,6 @@ msgstr ""
 "あるためです。"
 
 #. type: Plain text
-#: en/persistence.conf.5:193
+#: en/persistence.conf.5:192
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 7e591e9..9249b22 100644 (file)
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0.2-1\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"Project-Id-Version: live-boot 5.0~a3-1\n"
+"POT-Creation-Date: 2015-04-28 07:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-04-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0.2-1"
+msgid "5.0~a3-1"
 msgstr ""
 
 #. type: TH
@@ -735,7 +735,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:135
 #, no-wrap
-msgid "B<union>=aufs|unionfs"
+msgid "B<union>=aufs|overlay"
 msgstr ""
 
 #.  FIXME
@@ -743,7 +743,7 @@ msgstr ""
 #: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
-"unionfs."
+"overlay."
 msgstr ""
 
 #.  FIXME
@@ -823,7 +823,7 @@ msgid "B<persistence.conf>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -834,28 +834,28 @@ msgid "I<persistence.conf>(5)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -863,13 +863,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -878,13 +878,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 01cbc8e..7ee3cef 100644 (file)
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0.2-1\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"Project-Id-Version: live-boot 5.0~a3-1\n"
+"POT-Creation-Date: 2015-04-28 07:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-04-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0.2-1"
+msgid "5.0~a3-1"
 msgstr ""
 
 #. type: TH
@@ -59,34 +59,34 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -94,13 +94,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -109,13 +109,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -276,7 +276,7 @@ msgid "B<union>"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:101
+#: en/persistence.conf.5:100
 msgid ""
 "Save the rw branch of a union on the persistence media, so only the changes "
 "are stored persistently. This can potentially reduce disk usage compared to "
@@ -284,24 +284,23 @@ msgid ""
 "caveat is that the union will use I<DIR> from the image's read-only file "
 "system, not the real file system root, so files created after boot (e.g. by "
 "live-config) will not appear in the union. This option will use the union "
-"file system specified by live-boot's B<union> boot parameter, but is not "
-"supported with B<union=unionmount>."
+"file system specified by live-boot's B<union> boot parameter."
 msgstr ""
 
 #. type: SH
-#: en/persistence.conf.5:102
+#: en/persistence.conf.5:101
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr ""
 
 #. type: IP
-#: en/persistence.conf.5:103
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:109
+#: en/persistence.conf.5:108
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
 "to the device name). The B<persistence.conf> file can easily be edited "
@@ -310,100 +309,100 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/persistence.conf.5:110
+#: en/persistence.conf.5:109
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:115
+#: en/persistence.conf.5:114
 msgid ""
 "Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> "
 "file containing the following four lines (numbered for ease of reference):"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:115 en/persistence.conf.5:129
+#: en/persistence.conf.5:114 en/persistence.conf.5:128
 #, no-wrap
 msgid "1."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:118
+#: en/persistence.conf.5:117
 msgid "/home/user1 link,source=config-files/user1"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:118 en/persistence.conf.5:133
+#: en/persistence.conf.5:117 en/persistence.conf.5:132
 #, no-wrap
 msgid "2."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:121
+#: en/persistence.conf.5:120
 msgid "/home/user2 link,source=config-files/user2"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:121 en/persistence.conf.5:137
+#: en/persistence.conf.5:120 en/persistence.conf.5:136
 #, no-wrap
 msgid "3."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:124
+#: en/persistence.conf.5:123
 msgid "/home"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:124 en/persistence.conf.5:140
+#: en/persistence.conf.5:123 en/persistence.conf.5:139
 #, no-wrap
 msgid "4."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:127
+#: en/persistence.conf.5:126
 msgid "/usr union"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:129
+#: en/persistence.conf.5:128
 msgid "The corresponding source directories are:"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:133
+#: en/persistence.conf.5:132
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:137
+#: en/persistence.conf.5:136
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:140
+#: en/persistence.conf.5:139
 msgid "I<VOL>/home"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:143
+#: en/persistence.conf.5:142
 msgid "I<VOL>/usr"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:146
+#: en/persistence.conf.5:145
 msgid ""
 "It was necessary to set the B<source> options for 1 and 2, since they "
 "otherwise would become nested with 3's source, which is invalid."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 msgid ""
 "Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
 "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -412,79 +411,79 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 #, no-wrap
 msgid "a."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 #, no-wrap
 msgid "b."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 #, no-wrap
 msgid "c."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:160
+#: en/persistence.conf.5:159
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:162
+#: en/persistence.conf.5:161
 msgid "Then the following links and directories will be created:"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:162 en/persistence.conf.5:165
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:161 en/persistence.conf.5:164
+#: en/persistence.conf.5:170
 #, no-wrap
 msgid "Link:"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:165
+#: en/persistence.conf.5:164
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 #, no-wrap
 msgid "Dir:"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:170
 msgid "/homea/user2/.ssh (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:175
+#: en/persistence.conf.5:174
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:181
+#: en/persistence.conf.5:180
 msgid ""
 "One could argue, though, that lines 1 and 2 in the example B<persistence."
 "conf> file above are unnecessary since line 3 already would make all of /"
@@ -494,7 +493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:190
+#: en/persistence.conf.5:189
 msgid ""
 "Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
 "completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -506,6 +505,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:193
+#: en/persistence.conf.5:192
 msgid "I<live-boot>(7)"
 msgstr ""