From: Daniel Baumann Date: Wed, 6 Jun 2012 17:04:52 +0000 (+0200) Subject: Adding upstream version 3.0~a32. X-Git-Tag: upstream/3.0_a32^0 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=9a6a3a96c7f65fb063a775ae7ceee80e466e5a7d Adding upstream version 3.0~a32. --- diff --git a/Makefile b/Makefile index 79a9388..b3c7ba2 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ install: # Installing executables mkdir -p $(DESTDIR)/sbin - cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin + cp bin/live-new-uuid bin/live-swapfile $(DESTDIR)/sbin mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live @@ -58,10 +58,6 @@ install: mkdir -p $(DESTDIR)/usr/share/doc/live-boot cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot - mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples - cp -r examples/* $(DESTDIR)/usr/share/doc/live-boot/examples - # (FIXME) - # Installing manpages for MANPAGE in manpages/en/*; \ do \ @@ -80,7 +76,7 @@ install: uninstall: # Uninstalling executables - rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile + rm -f $(DESTDIR)/sbin/live-swapfile rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin > /dev/null 2>&1 || true rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live diff --git a/VERSION b/VERSION index 4fe660f..e7c0eca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a31-1 +3.0~a32-1 diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 4d01777..d3dce71 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -185,15 +185,6 @@ then manual_add_modules mtdblock fi -# Program: cpio -# busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots -if [ -e "${DESTDIR}/bin/cpio" ] -then - # Override already present cpio's, mostly klibc's - rm "${DESTDIR}/bin/cpio" -fi -copy_exec /bin/cpio /bin - # Program: udev if [ -x /sbin/udevadm ] then diff --git a/bin/live-snapshot b/bin/live-snapshot deleted file mode 100755 index 46ae597..0000000 --- a/bin/live-snapshot +++ /dev/null @@ -1,570 +0,0 @@ -#!/bin/sh - -# live-snapshot - utility to manage Debian Live systems snapshots -# -# This program mounts a device (fallback to /tmpfs under $MOUNTP -# and saves the /live/overlway (or a different directory) filesystem in it -# for reuse in another live-boot session. -# Look at the manpage for more informations. -# -# Copyright (C) 2006-2011 Marco Amadori -# Copyright (C) 2008 Chris Lamb -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# The complete text of the GNU General Public License -# can be found in /usr/share/common-licenses/GPL-3 file. - -# declare here two vars from /etc/live.conf because of "set -u" -ROOTSNAP="" -HOMESNAP="" - -if [ -n "${LIVE_SNAPSHOT_CHECK_UNBOUND}" ] -then - set -eu -else - set -e -fi - -## Begin FIXME: this is an embedded copy of the old 'live-helpers' initramfs script -if [ ! -x "/bin/fstype" ] -then - # klibc not in path -> not in initramfs - export PATH="${PATH}:/usr/lib/klibc/bin" -fi - -# handle upgrade path from old udev (using udevinfo) to -# recent versions of udev (using udevadm info) -if [ -x /sbin/udevadm ] -then - udevinfo='/sbin/udevadm info' -else - udevinfo='udevinfo' -fi - -old_root_overlay_label="live-rw" -old_home_overlay_label="home-rw" -custom_overlay_label="custom-ov" -root_snapshot_label="live-sn" -old_root_snapshot_label="live-sn" -home_snapshot_label="home-sn" -persistence_list="live-persistence.conf" - -# include all scripts for the time being until snapshots are either dropped or cleaned up -for _SCRIPT in /lib/live/boot/* -do - if [ -e "${_SCRIPT}" ] - then - . ${_SCRIPT} - fi -done -## End FIXME: this is an embedded copy of the old 'live-helpers' initramfs script - -LIVE_CONF="/etc/live/boot.d/snapshot.conf" - -if [ -r "${LIVE_CONF}" ] -then - . "${LIVE_CONF}" -fi - -export USERNAME USERFULLNAME HOSTNAME - -EXECUTABLE="${0}" -PROGRAM=$(basename "${EXECUTABLE}") - -# Needs to be available at run and reboot time -SAFE_TMPDIR="/live" - -# Permits multiple runs -MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)" -DEST="${MOUNTP}/live-sn.cpio.gz" -DEF_SNAP_COW="/live/overlay" -TMP_FILELIST="${PROGRAM}.list" - -# Command line defaults and declarations -SNAP_COW="${DEF_SNAP_COW}" -SNAP_DEV="" -SNAP_MNT="" -SNAP_OUTPUT="" -SNAP_RESYNC_STRING="" -SNAP_TYPE="cpio" -SNAP_LIST="/etc/live-snapshot.list" -EXCLUDE_LIST="/etc/live-snapshot.exclude_list" - -Error () -{ - echo "${PROGRAM}: error:" ${@} - exit 1 -} - -panic () -{ - Error ${@} -} - -Header () -{ - echo "${PROGRAM} - utility to perform snapshots of Debian Live systems" - echo - echo "usage: ${PROGRAM} [-c|--cow DIRECTORY] [-d|--device DEVICE] [-o|--output FILE] [-t|--type TYPE]" - echo " ${PROGRAM} [-r|--resync-string STRING]" - echo " ${PROGRAM} [-f|--refresh]" - echo " ${PROGRAM} [-h|--help]" - echo " ${PROGRAM} [-u|--usage]" - echo " ${PROGRAM} [-v|--version]" -} - -Help () -{ - Header - - echo - echo "Options:" - echo " -c, --cow: copy on write directory (default: ${SNAP_COW})." - echo " -d, --device: output snapshot device (default: ${SNAP_DEV:-auto})." - echo " -o, --output: output image file (default: ${DEST})." - echo " -r, --resync-string: internally used to resync previous made snapshots." - echo " -f, --refresh: try to sync a running snapshot." - echo " -t, --type: snapshot filesystem type. Options: \"squashfs\", \"ext2\", \"ext3\", \"ext4\", \"jffs2\" or \"cpio\".gz archive (default: ${SNAP_TYPE})" - echo - echo "Look at live-snapshot(1) man page for more information." - - exit 0 -} - -Usage () -{ - Header - - echo - echo "Try \"${PROGRAM} --help\" for more information." - - exit 0 -} - -Version () -{ - echo "${PROGRAM}" - echo - echo "Copyright (C) 2006-2011 Marco Amadori " - echo "Copyright (C) 2008 Chris Lamb " - echo - echo "This program is free software; you can redistribute it and/or modify" - echo "it under the terms of the GNU General Public License as published by" - echo "the Free Software Foundation; either version 3 of the License, or" - echo "(at your option) any later version." - echo - echo "This program is distributed in the hope that it will be useful," - echo "but WITHOUT ANY WARRANTY; without even the implied warranty of" - echo "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" - echo "GNU General Public License for more details." - echo - echo "You should have received a copy of the GNU General Public License" - echo "along with this program; if not, write to the Free Software" - echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" - echo - echo "The complete text of the GNU General Public License" - echo "can be found in /usr/share/common-licenses/GPL-3 file." - echo - echo "Homepage: " - - exit 0 -} - -Try_refresh () -{ - FOUND="" - if [ -n "${ROOTSNAP}" ]; then - "${EXECUTABLE}" --resync-string="${ROOTSNAP}" - FOUND="true" - fi - - if [ -n "${HOMESNAP}" ]; then - "${EXECUTABLE}" --resync-string="${HOMESNAP}" - FOUND="true" - fi - - if [ -z "${FOUND}" ] - then - echo "No autoconfigured snapshots found at boot;" > /dev/null 1>&2 - echo "(no resync string in ${LIVE_CONF})." > /dev/null 1>&2 - exit 1 - fi -} - -Parse_args () -{ - # Parse command line - ARGS="${*}" - ARGUMENTS="$(getopt --longoptions cow:,device:,output,resync-string:,refresh,type:,help,usage,version --name=${PROGRAM} --options c:d:o:t:r:fhuv --shell sh -- ${ARGS})" - - eval set -- "${ARGUMENTS}" - - while true - do - case "${1}" in - -c|--cow) - SNAP_COW="${2}" - shift 2 - ;; - - -d|--device) - SNAP_DEV="${2}" - shift 2 - ;; - - -o|--output) - SNAP_OUTPUT="${2}" - shift 2 - ;; - - -t|--type) - SNAP_TYPE="${2}" - shift 2 - ;; - - -r|--resync-string) - SNAP_RESYNC_STRING="${2}" - break - ;; - - -f|--refresh) - Try_refresh - exit 0 - ;; - - -h|--help) - Help - ;; - - -u|--usage) - Usage - ;; - - -v|--version) - Version - ;; - - --) - shift - break - ;; - - *) - Error "internal error." - ;; - - esac - done -} - -Defaults () -{ - # Parse resync string - if [ -n "${SNAP_RESYNC_STRING}" ] - then - SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -r -e 's#^([^:]*).*$#'"${DEF_SNAP_COW}"'\1#') - SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':') - SNAP_MNT=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':') - DEST="${MOUNTP}/${SNAP_MNT}" - - case "${SNAP_MNT}" in - *.cpio.gz) - SNAP_TYPE="cpio" - ;; - - *.squashfs) - SNAP_TYPE="squashfs" - ;; - - *.jffs2) - SNAP_TYPE="jffs2" - ;; - - *.ext2|*.ext3) - SNAP_TYPE="ext2" - ;; - - "") - SNAP_TYPE="whole_partition" - ;; - - *.ext4) - SNAP_TYPE="ext4" - ;; - - *) - Error "unrecognized resync string" - ;; - esac - elif [ -z "${SNAP_OUTPUT}" ] - then - # Set target file based on image - case "${SNAP_TYPE}" in - cpio) - DEST="${MOUNTP}/live-sn.cpio.gz" - ;; - - squashfs|jffs2|ext2) - DEST="${MOUNTP}/live-sn.${SNAP_TYPE}" - ;; - - ext3) - DEST="${MOUNTP}/live-sn.ext2" - ;; - - ext4) - DEST="${MOUNTP}/live-sn.ext4" - ;; - esac - else - DEST="${SNAP_OUTPUT}" - fi -} - -Validate_input () -{ - case "${SNAP_TYPE}" in - cpio|squashfs|jffs2|ext2|ext3|ext4|whole_partition) - ;; - - *) - Error "invalid filesystem type \"${SNAP_TYPE}\"" - ;; - esac - - if [ ! -d "${SNAP_COW}" ] - then - Error "${SNAP_COW} is not a directory" - fi - - if [ "$(id -u)" -ne 0 ] - then - Error "you are not root" - fi -} - -Mount_device () -{ - case "${SNAP_DEV}" in - "") - # create a temp - mount -t tmpfs -o rw tmpfs "${MOUNTP}" - ;; - - *) - if [ -b "${SNAP_DEV}" ] - then - try_mount "${SNAP_DEV}" "${MOUNTP}" rw - fi - ;; - esac -} - -Entry_is_modified () -{ - # Returns true if file exists and it is also present in "cow" directory - # This means it is modified in respect to read-only media, so it deserve - # to be saved - - entry="${1}" - - if [ -e "${entry}" ] || [ -L "${entry}" ] - then - if [ -e "${SNAP_COW}/${entry}" ] || [ -L "${SNAP_COW}/${entry}" ] - then - return 0 - fi - fi - return 1 -} - -Do_filelist () -{ - # BUGS: does not handle deleted files yet - TMP_FILELIST=$1 - - if [ -f "${SNAP_LIST}" ] - then - # if SNAP_COW == /live/overlay/home, SNAP_RW = /home - SNAP_RW=$(echo "${SNAP_COW}" | sed -e "s|${DEF_SNAP_COW}||g") - if [ -z "${SNAP_RW}" ] - then - SNAP_RW="/" - fi - - cd "${SNAP_RW}" - # Generate include list removing empty and commented lines - # and transforming paths to relatives - for entry in $(sed -e '/^ *$/d' -e '/^#.*$/d' -e 's#^.*$#./&#' -e 's#/\+#/#g' "${SNAP_LIST}") - do - if [ -d "${entry}" ] - then - find "${entry}" | while read line - do - if Entry_is_modified "${line}" - then - printf "%s\000" "${line}" >> "${TMP_FILELIST}" - fi - done - elif Entry_is_modified "${entry}" - then - # if file exists and it is modified - printf "%s\000" "${entry}" >> "${TMP_FILELIST}" - fi - done - cd "${OLDPWD}" - - # echo Working dir - echo "${SNAP_RW}" - else - cd "${SNAP_COW}" - # removing whiteouts from list - find . -path '*.wh.*' -prune -o -print0 >> "${TMP_FILELIST}" - cd "${OLDPWD}" - # echo Working dir - echo "${SNAP_COW}" - fi -} - -Do_snapshot () -{ - TMP_FILELIST=$(mktemp -p "${SAFE_TMPDIR}" "${TMP_FILELIST}.XXXXXX") - if [ -e "${EXCLUDE_LIST}" ] - then - # Create a TMP filelist removing empty lines (grep -f does not like them) - # and comments (for speedup and LST) - TMP_EXCLUDE_LIST=$(mktemp -p "${SAFE_TMPDIR}" "${PROGRAM}_excludelist.XXXXXX") - grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' > "${TMP_EXCLUDE_LIST}" - fi - - case "${SNAP_TYPE}" in - squashfs) - echo ".${TMP_FILELIST}" > "${TMP_FILELIST}" - # Removing whiteheads of unionfs - cd "${SNAP_COW}" - find . -name '*.wh.*' >> "${TMP_FILELIST}" - - if [ -e "${EXCLUDE_LIST}" ] - then - # Add explicitly excluded files - cat "${TMP_EXCLUDE_LIST}" >> "${TMP_FILELIST}" - fi - - cd "${OLDPWD}" - mksquashfs "${SNAP_COW}" "${DEST}" -ef "${TMP_FILELIST}" - ;; - - cpio|whole_partition) - if [ "${SNAP_TYPE}" = "cpio" ] - then - COPY_CMD="cpio --quiet -o0 -H newc | gzip -9c > ${DEST}" - else - COPY_CMD="cpio --quiet -pumd0 ${DEST}/" - fi - - WORKING_DIR=$(Do_filelist "${TMP_FILELIST}") - cd "${WORKING_DIR}" - if [ -e "${EXCLUDE_LIST}" ] - then - - # Convert \0 to \n and tag existing (rare but possible) \n in filenames, - # this to let grep -F -v do a proper work in filtering out - cat "${TMP_FILELIST}" | \ - tr '\n' '\1' | \ - tr '\0' '\n' | \ - grep -F -v -f "${TMP_EXCLUDE_LIST}" | \ - tr '\n' '\0' | \ - tr '\1' '\n' | \ - eval $COPY_CMD || exit 1 - else - cat "${TMP_FILELIST}" | \ - eval $COPY_CMD || exit 1 - fi - cd "${OLDPWD}" - ;; - - # ext2|ext3|ext4 and jffs2 does not easily support an exclude list; files - # should be copied to another directory in order to filter content - ext2|ext3|ext4) - 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... - genext2fs --size-in-blocks=${REAL_DIM} --reserved-percentage=0 --root="${SNAP_COW}" "${DEST}" - ;; - - jffs2) - mkfs.jffs2 --root="${SNAP_COW}" --output="${DEST}" - ;; - esac - - # Remove temporary file lists - for filelist in "${TMP_FILELIST}" "${TMP_EXCLUDE_LIST}" - do - if [ -f "${filelist}" ] - then - rm -f "${filelist}" - fi - done -} - -Clean () -{ - if [ -z "${SNAP_RESYNC_STRING}" ] && echo "${DEST}" | grep -q "${MOUNTP}" - then - echo "${DEST} is present on ${MOUNTP}, therefore no automatic unmounting the latter." > /dev/null 1>&2 - else - umount "${MOUNTP}" - rmdir "${MOUNTP}" - fi -} - -Warn_user () -{ - if [ -z "${SNAP_RESYNC_STRING}" ] - then - case ${SNAP_TYPE} in - cpio|ext2|ext3|ext4) - echo "Please move ${DEST} (if is not already in it)" > /dev/null 1>&2 - echo "in a supported writable partition (e.g ext3, vfat)." > /dev/null 1>&2 - ;; - - squashfs) - echo "To use ${DEST} you need to rebuild your media or add it" > /dev/null 1>&2 - echo "to your multisession disc under the \"/live\" directory." > /dev/null 1>&2 - ;; - - jffs2) - echo "Please cat or flashcp ${DEST} to your partition in order to start using it." > /dev/null 1>&2 - ;; - esac - - if grep -qv persistence /proc/cmdline - then - echo "Remember to boot this live system with \"persistence\" specified at boot prompt." > /dev/null 1>&2 - fi - fi -} - -Main () -{ - Parse_args "${@}" - Defaults - Validate_input - trap 'Clean' EXIT - Mount_device - Do_snapshot - Warn_user -} - -Main "${@:-}" diff --git a/examples/live-persistence.binds b/examples/live-persistence.binds deleted file mode 100644 index b2c3833..0000000 --- a/examples/live-persistence.binds +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/live-persistence.binds example -# -# If this file is present in the proper path, each uncommented not empty line -# will be treated as a directory which should not be made persistent and -# which it's content should be volatile. -# -# This is achieved by bind mounting on it a tmpfs clone of the directory specified - -# Exclude some standard temporary paths -/tmp -/var/log -/var/cache - -# Firefox profiles are not always useful to remember -/root/.mozilla diff --git a/examples/live-snapshot.exclude_list b/examples/live-snapshot.exclude_list deleted file mode 100644 index 82972e3..0000000 --- a/examples/live-snapshot.exclude_list +++ /dev/null @@ -1,17 +0,0 @@ -# /etc/live-snapshot.exclude_list example -# -# If this file is present in the proper path, each uncommented not empty line -# will be excluded in the target snapshot when live-snapshot is run. -# -# The syntax for the line is just a full file or directory pathname. - -# Each line is treated like a plain match string for "grep -F -v", -# so be careful: e.g. "/tmp" will exclude also "/var/tmp" ! - -# Exclude some standard temporary paths -/tmp -/var/log -/var/cache - -# Firefox profiles are not always useful to remember -/root/.mozilla diff --git a/examples/live-snapshot.list b/examples/live-snapshot.list deleted file mode 100644 index db05733..0000000 --- a/examples/live-snapshot.list +++ /dev/null @@ -1,20 +0,0 @@ -# /etc/live-snapshot resync list example -# -# If this file is present, each uncommented not empty line will be parsed when -# running live-snapshot and included in target snapshot. -# -# The syntax for the line is just a full file or directory pathname. -# Those files and directories, and only those will be included on automatic persistence handling. -# -# Note that in home-sn snapshot all those paths are treated as relative to /home - -# Include itself for reuse -/etc/live-snapshot.list - -# Include networking setups -/etc/network/interfaces -/etc/resolv.conf -/etc/hosts - -# Include the whole Desktop directory of the default user -/home/user/Desktop diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index a70f125..ec0a92f 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 05.06.2012 3.0~a31\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 06.06.2012 3.0~a32\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts @@ -178,16 +178,10 @@ option has no currently no effect when booting with toram. This parameter enables usage of local swap partitions. .IP \fBpersistence\fP 4 live\-boot will probe devices for persistence media. These can be partitions -(with the correct GPT name), filesystems (with the correct label) or -image/archive files (with the correct file name). Overlays are labeled/named -either "full\-ov", which will be mounted on /, or "custom\-ov", which can be -completely customized (see \fIlive\-persistence.conf\fP(5)); snapshots are -labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or -/home, respectively (see \fIlive\-snapshot\fP(1) for more information). The -order these are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay -image files and snapshot archive files have extensions which determines -their filesystem or archive type, e.g. "custom\-ov.ext4" and -"home\-sn.squashfs". +(with the correct GPT name), filesystems (with the correct label) or image +files (with the correct file name). Overlays are labeled/named "persistence" +(see \fIlive\-persistence.conf\fP(5)). Overlay image files have extensions which +determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we @@ -196,22 +190,20 @@ media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none". .IP \fBpersistence\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4 If you specify the keyword 'removable', live\-boot will try to find -persistence and snapshot partitions on removable media only. Note that if -you want to further restrict the media to usb mass storage only, you can use -the 'removable\-usb' keyword. +persistence partitions on removable media only. Note that if you want to +further restrict the media to usb mass storage only, you can use the +\&'removable\-usb' keyword. .IP "\fBpersistence\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 This option determines which types of persistence media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and -"home\-rw"); if "snapshot" is in the list, we consider snapshots -(i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot". +"home\-rw"). The default is "overlay". .IP \fBpersistence\-path\fP=\fIPATH\fP 4 live\-boot will look for persistency files in the root directory of a partition, with this parameter, the path can be configured so that you can have multiple directories on the same partition to store persistency files. .IP \fBpersistence\-read\-only\fP 4 Filesystem changes are not saved back to persistence media. In particular, -overlays and netboot NFS mounts are mounted read\-only, and snapshots are not -resynced on shutdown. +overlays and netboot NFS mounts are mounted read\-only. .IP "\fBpersistence\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems @@ -256,6 +248,7 @@ unionfs. Some variables can be configured via this config file (inside the live system). .IP \fBlive/filesystem.module\fP 4 +.\" FIXME This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be @@ -264,17 +257,6 @@ here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order. -.IP \fB/etc/live\-persistence.binds\fP 4 -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. -.br -.\" FIXME -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. .SH FILES .IP \fB/etc/live/boot.conf\fP 4 @@ -284,8 +266,6 @@ directory with a tmpfs on the original path. .IP \fBlive\-persistence.conf\fP 4 .SH "SEE ALSO" -\fIlive\-snapshot\fP(1) -.PP \fIlive\-persistence.conf\fP(5) .PP \fIlive\-build\fP(7) diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5 index ae5b183..53549a3 100644 --- a/manpages/de/live-persistence.conf.de.5 +++ b/manpages/de/live-persistence.conf.de.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 05.06.2012 3.0~a31\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 06.06.2012 3.0~a32\-1 "Debian Live Project" .SH NAME \fBlive\-persistence.conf\fP \- Configuration file for persistence media in @@ -11,7 +11,7 @@ live\-boot .SH DESCRIPTION If live\-boot probes a persistence volume with the label (or GPT name, or -file name, but from now on we will just say "label") "custom\-ov", that +file name, but from now on we will just say "label") "persistence", that volume's persistence is fully customizable through the \fBlive\-persistence.conf\fP file stored on the root of its file system. Any such labeled volume must have such a file, or it will be ignored. @@ -29,13 +29,12 @@ the list of \fIOPTION\fPs". .PP For each custom mount \fIDIR\fP must be an absolute path that cannot contain white spaces or the special . and .. path components, and cannot be /live -(or any of its sub\-directories), or / (for the latter, use "full\-ov" -persistence instead). Once activated all changes (file deletion, creation -and modification) to \fIDIR\fP on the live file system are stored persistently -into a path equivalent to \fIDIR\fP on the persistence media, called the source -directory. The default way to achieve persistence is to simply bind\-mount -the corresponding source directory to \fIDIR\fP, but this can be changed -through the use of \fIOPTION\fPs. +(or any of its sub\-directories). Once activated all changes (file deletion, +creation and modification) to \fIDIR\fP on the live file system are stored +persistently into a path equivalent to \fIDIR\fP on the persistence media, +called the source directory. The default way to achieve persistence is to +simply bind\-mount the corresponding source directory to \fIDIR\fP, but this can +be changed through the use of \fIOPTION\fPs. .PP All custom mounts will be done in an order so that no two custom mounts can "hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1 deleted file mode 100644 index 3c13106..0000000 --- a/manpages/de/live-snapshot.de.1 +++ /dev/null @@ -1,114 +0,0 @@ -.\"******************************************************************* -.\" -.\" This file was generated with po4a. Translate the source file. -.\" -.\"******************************************************************* -.TH LIVE\-BOOT 1 05.06.2012 3.0~a31\-1 "Debian Live Project" - -.SH NAME -\fBlive\-snapshot\fP \- simple script to ease persistence usage - -.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 -\fBlive\-snapshot\fP [\-r|\-\-resync\-string STRING] -.br -\fBlive\-snapshot\fP [\-h|\-\-help] -.br -\fBlive\-snapshot\fP [\-u|\-\-usage] -.br -\fBlive\-snapshot\fP [\-v|\-\-version] - -.SH DESCRIPTION -live\-snapshot is a script which can be used to build the right types of -persistence 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 OPTIONS -.IP "\-c, \-\-cow \fIDIRECTORY\fP" 4 -specifies the input directory to be cloned in the image file. Its default -value "/live/overlay" should be right for most uses. However it could be -handy to specify "/home" and type ext4 for the type to prepare an image file -suited to be directly mounted by live\-boot as home. -.IP "\-d, \-\-device \fIDEVICE\fP" 4 -sets the device where the media with the snapshot/persistence file/partition -will be put. If it is not specified, a tmpfs will be used and linked to the -user's desktop to move it where it is needed. If the device has no -filesystem, an ext4 fs will be automatically created and labelled according -to the values specified after the "\-\-output" value or with a sane default. -.IP "\-e, \-\-exclude\-list \fIFILE\fP" 4 -a file containing a list of filenames/paths that should not be saved. This -exclude list will be remebered on the target snapshot media for reuse. -.IP "\-o, \-\-output \fIFILE\fP" 4 -the filename/label used for the output file/partition. If left blank, -live\-snapshot will search for a proper file on the device or use the whole -partition. -.IP "\-r, \-\-resync\-string \fISTRING\fP" 4 -internally used on resyncs. -.IP "\-f, \-\-refresh" 4 -try to do the same operation that should be done at reboot or halt, -resyncing boot\-time auto discovered snapshots. Useful to prevent a crash or -surge power\-off. -.IP "\-t, \-\-type \fITYPE\fP" 4 -Type could be one of "cpio", "squashfs", "ext2", "ext3", "ext4", or "jffs2". -.IP "\-h, \-\-help" 4 -display help and exit. -.IP "\-u, \-\-usage" 4 -show usage and exit. -.IP "\-v, \-\-version" 4 -output version information and exit. - -.SH FILES -.IP \fB/etc/live.conf\fP 4 -Some variables can be configured via this config file (inside the live -system). -.IP \fBlive/filesystem.module\fP 4 -This optional file (inside the live media) contains a list of white\-space or -carriage\-return\-separated file names corresponding to disk images in the -"/live" directory. If this file exists, only images listed here will be -merged into the root aufs, and they will be loaded in the order listed -here. The first entry in this file will be the "lowest" point in the aufs, -and the last file in this list will be on the "top" of the aufs, directly -below /overlay. Without this file, any images in the "/live" directory are -loaded in alphanumeric order. -.IP \fB/etc/live\-persistence.binds\fP 4 -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: -i.e. their content does not need to survive reboots when using the -persistence features. -.br -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. -.IP \fB/etc/live\-snapshot.list\fP 4 -This optional file, if present changes the behaviour of live\-snapshot: only -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 "SEE ALSO" -\fIlive\-boot\fP(1) -.PP -\fIlive\-build\fP(7) -.PP -\fIlive\-config\fP(7) -.PP -\fIlive\-tools\fP(7) - -.SH HOMEPAGE -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 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 AUTHOR -live\-boot was written by Daniel Baumann <\fIdaniel@debian.org\fP> for -the Debian project. diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 2606bbb..6c60d8d 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2012\-06\-05 3.0~a31-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-06\-06 3.0~a32-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts @@ -109,17 +109,17 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option .IP "\fBswapon\fR" 4 This parameter enables usage of local swap partitions. .IP "\fBpersistence\fR" 4 -live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive-persistence.conf\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext4" and "home\-sn.squashfs". +live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIlive-persistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none". .IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4 -If you specify the keyword 'removable', live\-boot will try to find persistence and snapshot partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword. +If you specify the keyword 'removable', live\-boot will try to find persistence partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword. .IP "\fBpersistence\-method\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 -This option determines which types of persistence media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"); if "snapshot" is in the list, we consider snapshots (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot". +This option determines which types of persistence media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"). The default is "overlay". .IP "\fBpersistence\-path\fR=\fIPATH\fR" 4 live\-boot will look for persistency files in the root directory of a partition, with this parameter, the path can be configured so that you can have multiple directories on the same partition to store persistency files. .IP "\fBpersistence\-read\-only\fR" 4 -Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only, and snapshots are not resynced on shutdown. +Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only. .IP "\fBpersistence\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem". .IP "\fBpersistence\-subtext\fR=\fISUFFIX\fR" 4 @@ -144,10 +144,6 @@ By default, live\-boot uses aufs. With this parameter, you can switch to unionfs Some variables can be configured via this config file (inside the live system). .IP "\fBlive/filesystem.module\fR" 4 This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order. -.IP "\fB/etc/live\-persistence.binds\fR" 4 -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. -.br -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. .\" FIXME .SH FILES @@ -158,8 +154,6 @@ This saves expensive writes and speeds up operations on volatile data such as we .IP "\fBlive-persistence.conf\fR" 4 .SH SEE ALSO -\fIlive\-snapshot\fR(1) -.PP \fIlive-persistence.conf\fR(5) .PP \fIlive\-build\fR(7) diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5 index 1ea2a79..e456faa 100644 --- a/manpages/en/live-persistence.conf.5 +++ b/manpages/en/live-persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2012\-06\-05 3.0~a31-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-06\-06 3.0~a32-1 "Debian Live Project" .SH NAME \fBlive-persistence.conf\fR \- Configuration file for persistence media in @@ -6,7 +6,7 @@ live\-boot .SH DESCRIPTION If live-boot probes a persistence volume with the label (or GPT name, -or file name, but from now on we will just say "label") "custom\-ov", +or file name, but from now on we will just say "label") "persistence", that volume's persistence is fully customizable through the \fBlive-persistence.conf\fR file stored on the root of its file system. Any such labeled volume must have such a file, or it will be ignored. @@ -24,8 +24,8 @@ described by the list of \fIOPTION\fRs". .PP For each custom mount \fIDIR\fR must be an absolute path that cannot contain white spaces or the special . and .. path components, and -cannot be /live (or any of its sub-directories), or / (for the latter, -use "full-ov" persistence instead). Once activated all changes (file +cannot be /live (or any of its sub-directories). +Once activated all changes (file deletion, creation and modification) to \fIDIR\fR on the live file system are stored persistently into a path equivalent to \fIDIR\fR on the persistence media, called the source directory. The default way to diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1 deleted file mode 100644 index 81e4a86..0000000 --- a/manpages/en/live-snapshot.1 +++ /dev/null @@ -1,70 +0,0 @@ -.TH LIVE\-BOOT 1 2012\-06\-05 3.0~a31-1 "Debian Live Project" - -.SH NAME -\fBlive\-snapshot\fR \- simple script to ease persistence usage - -.SH SYNOPSIS -\fBlive\-snapshot\fR [\-c|\-\-cow \fIDIRECTORY\fI] [\-d|\-\-device \fIDEVICE\fR] [\-e|\-\-exclude\-list \fIFILE\fR] [\-o|\-\-output \fIFILE\fR] [\-t|\-\-type \fITYPE\fR] -.br -\fBlive\-snapshot\fR [\-r|\-\-resync\-string \fRSTRING\fR] -.br -\fBlive\-snapshot\fR [\-h|\-\-help] -.br -\fBlive\-snapshot\fR [\-u|\-\-usage] -.br -\fBlive\-snapshot\fR [\-v|\-\-version] - -.SH DESCRIPTION -live\-snapshot is a script which can be used to build the right types of persistence image files supported by \fIlive\-boot\fR(7). It is also used on exit by the live\-boot init script to resync the boot\-found snapshots devices. - -.SH OPTIONS -.IP "\-c, \-\-cow \fIDIRECTORY\fR" 4 -specifies the input directory to be cloned in the image file. Its default value "/live/overlay" should be right for most uses. However it could be handy to specify "/home" and type ext4 for the type to prepare an image file suited to be directly mounted by live\-boot as home. -.IP "\-d, \-\-device \fIDEVICE\fR" 4 -sets the device where the media with the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext4 fs will be automatically created and labelled according to the values specified after the "\-\-output" value or with a sane default. -.IP "\-e, \-\-exclude\-list \fIFILE\fR" 4 -a file containing a list of filenames/paths that should not be saved. This exclude list will be remebered on the target snapshot media for reuse. -.IP "\-o, \-\-output \fIFILE\fR" 4 -the filename/label used for the output file/partition. If left blank, live\-snapshot will search for a proper file on the device or use the whole partition. -.IP "\-r, \-\-resync\-string \fISTRING\fR" 4 -internally used on resyncs. -.IP "\-f, \-\-refresh" 4 -try to do the same operation that should be done at reboot or halt, resyncing boot\-time auto discovered snapshots. Useful to prevent a crash or surge power\-off. -.IP "\-t, \-\-type \fITYPE\fR" 4 -Type could be one of "cpio", "squashfs", "ext2", "ext3", "ext4", or "jffs2". -.IP "\-h, \-\-help" 4 -display help and exit. -.IP "\-u, \-\-usage" 4 -show usage and exit. -.IP "\-v, \-\-version" 4 -output version information and exit. - -.SH FILES -.IP "\fB/etc/live.conf\fR" 4 -Some variables can be configured via this config file (inside the live system). -.IP "\fBlive/filesystem.module\fR" 4 -This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order. -.IP "\fB/etc/live\-persistence.binds\fR" 4 -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: i.e. their content does not need to survive reboots when using the persistence features. -.br -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. -.IP "\fB/etc/live\-snapshot.list\fR" 4 -This optional file, if present changes the behaviour of live\-snapshot: only 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 SEE ALSO -\fIlive\-boot\fR(1) -.PP -\fIlive\-build\fR(7) -.PP -\fIlive\-config\fR(7) -.PP -\fIlive\-tools\fR(7) - -.SH HOMEPAGE -More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>. - -.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/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>. - -.SH AUTHOR -live\-boot was written by Daniel Baumann <\fIdaniel@debian.org\fR> for the Debian project. diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index f18888f..8150ad4 100644 --- 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 05.06.2012 3.0~a31\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 06.06.2012 3.0~a32\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema @@ -187,18 +187,11 @@ actualmente ningún efecto cuando se arranca con toram .IP \fBswapon\fP 4 Este parámetro permite el uso de particiones swap locales. .IP \fBpersistence\fP 4 -live\-boot buscará dispositivos con "persistence". Estos pueden ser -particiones (con el nombre GPT correcto), sistemas de ficheros (con la -etiqueta correcta) o ficheros imagen/archivo (con el nombre de fichero -correcto). Overlays con la etiqueta/nombre "full\-ov", que se montará en / o -"custom\-ov", que puede ser completamente personalizado (ver -\fIlive\-persistence.conf\fP(5)); las instantáneas tienen la etiqueta/nombre -"live\-sn" o "home\-sn" y se extraerán respectivamente en / o /home (ver -\fIlive\-snapshot\fP(1) para más información). El orden en que se tratan son: -full\-ov, custom\-ov, live\-sn, home\-sn. Los ficheros imagen overlay y los -ficheros archivo instantáneas tienen extensiones que determinan el tipo de -fichero o de sistema de ficheros, por ejemplo, "custom\-ov.ext4" y -"home\-sn.squashfs". +live\-boot will probe devices for persistence media. These can be partitions +(with the correct GPT name), filesystems (with the correct label) or image +files (with the correct file name). Overlays are labeled/named "persistence" +(see \fIlive\-persistence.conf\fP(5)). Overlay image files have extensions which +determines their filesystem, e.g. "persistence.ext4". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 Esta opción determina qué tipo de cifrado se usa cuando se prueban los dispositivos de los medios con persistencia. Si se especifica "none" en la @@ -207,26 +200,22 @@ se puede usar cifrado LUKS en los medios. Cada vez que se encuentra un dispositivo que contiene medios cifrados se pregunta al usuario una frase de contraseña. Por defecto es "none". .IP \fBpersistence\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4 -Si se especifica la palabra clave 'removable', live\-boot intentará encontrar -particiones con persistencia e instantáneas únicamente en los medios -extraíbles. Tener en cuenta que si se desea restringir aún más los medios a -sistemas de almacenamiento masivo USB se puede utilizar la palabra clave -\&'removable\-usb' +If you specify the keyword 'removable', live\-boot will try to find +persistence partitions on removable media only. Note that if you want to +further restrict the media to usb mass storage only, you can use the +\&'removable\-usb' keyword. .IP "\fBpersistence\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 -Esta opción determina qué tipos de medios se permiten para la -persistencia. Si se especifica "overlay" en la lista, se considera overlays -(es decir "live\-rw" y "home\-rw"); si se especifica "snapshot" en la lista, -se consideran instantáneas (es decir "live\-sn" y "home\-sn"). Por defecto es -"overlay,snapshot". +This option determines which types of persistence media we allow. If +"overlay" is in the list, we consider overlays (i.e. "live\-rw" and +"home\-rw"). The default is "overlay". .IP \fBpersistence\-path\fP=\fIPATH\fP 4 live\-boot buscará ficheros con persistencia en el directorio raíz de una partición, con este parámetro, la ruta se puede configurar de modo que se pueda tener varios directorios en la misma partición para almacenar ficheros con persistencia. .IP \fBpersistence\-read\-only\fP 4 -Los cambios en el sistema de ficheros no se guardan de nuevo en los medios -con persistencia. En particular, los overlays y los montajes NFS de red son -montados en sólo lectura, y las instantáneas no se resincronizan al apagar. +Filesystem changes are not saved back to persistence media. In particular, +overlays and netboot NFS mounts are mounted read\-only. .IP "\fBpersistence\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 Esta opción determina qué tipos de almacenamiento persistente hay que tener en cuenta cuando se comprueban los medios con persistencia. Si "filesystem" @@ -279,6 +268,7 @@ configuración (dentro del sistema en vivo). Algunas variables pueden ser configuradas a través de este fichero de configuración (dentro del sistema en vivo). .IP \fBlive/filesystem.module\fP 4 +.\" FIXME #\-#\-#\-#\-# live\-snapshot.1.po (live\-snapshot) #\-#\-#\-#\-# Este fichero opcional (dentro del medio en vivo) contiene una lista de nombres de ficheros separados por espacios en blanco o retornos de carro que @@ -299,18 +289,6 @@ este fichero será el punto "más bajo" en el aufs y el último fichero de esta lista estará en el punto "más alto" del aufs, justo debajo de /overlay. Sin este fichero, las imágenes en el directorio "/live" se cargan en orden alfanumérico. -.IP \fB/etc/live\-persistence.binds\fP 4 -Este fichero opcional (que reside en el sistema rootfs, no en los medios en -vivo) se utiliza como una lista de directorios que no necesitan ser -persistentes: es decir, su contenido no necesita sobrevivir tras reiniciar -cuando se utiliza la persistencia. -.br -.\" FIXME -Esto ahorra costosas escrituras y acelera las operaciones sobre los datos -volátiles, tales como las caches web y los archivos temporales (como por -ejemplo, /tmp y .mozilla) que se regeneran cada vez. Esto se logra mediante -un montaje enlazado de cada directorio de la lista con un tmpfs en la ruta -original. .SH FICHEROS .IP \fB/etc/live/boot.conf\fP 4 @@ -320,8 +298,6 @@ original. .IP \fBlive\-persistence.conf\fP 4 .SH "VER ADEMÁS" -\fIlive\-snapshot\fP(1) -.PP \fIlive\-persistence.conf\fP(5) .PP \fIlive\-build\fP(7) diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5 index e7dc500..a448989 100644 --- a/manpages/es/live-persistence.conf.es.5 +++ b/manpages/es/live-persistence.conf.es.5 @@ -3,19 +3,18 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 05.06.2012 3.0~a31\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 06.06.2012 3.0~a32\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento con persistencia en live\-boot .SH DESCRIPCIÓN -Si live\-boot prueba un volumen persistente con la etiqueta (o nombre GPT, o -nombre de fichero, aunque a partir de este momento nos referiremos a él como -simplemente "etiqueta") "custom\-ov", la persistencia de ese volumen es -completamente personalizable a través del fichero \fBlive\-persistence.conf\fP -almacenado en la raíz de su sistema de ficheros. Cualquier volumen con una -de esas etiquetas debe tener uno de esos ficheros, o si no será ignorado. +If live\-boot probes a persistence volume with the label (or GPT name, or +file name, but from now on we will just say "label") "persistence", that +volume's persistence is fully customizable through the +\fBlive\-persistence.conf\fP file stored on the root of its file system. Any +such labeled volume must have such a file, or it will be ignored. .PP El formato de \fBlive\-persistence.conf\fP permite añadir líneas vacias o líneas que comiencen por "#" (usado para los comentarios), ambos serán @@ -28,17 +27,14 @@ ignorados. Un "montaje personalizado" tiene el formato: lo que se traduce como "hacer \fIDIR\fP persistente en la forma descrita en la lista de \fIOPTION\fPs". .PP -Para cada uno de los montajes personalizados \fIDIR\fP debe ser una ruta -absoluta que no puede contener espacios en blanco ni los componentes -especiales . y .. además no puede ser /live (o ninguno de sus -sub\-directorios) ni / (para este último utilizar persistencia -"full\-ov"). Una vez activados todos los cambios (creación, modificación y -borrado de ficheros) en \fIDIR\fP en el sistema de ficheros en vivo, son -guardados de forma persistente en una ruta equivalente a \fIDIR\fP en el medio -persistente, llamado el directorio de origen. La manera de conseguir la -persistencia por defecto es simplemente hacer un montaje enlazado -(bind\-mount N.del T.) del directorio de origen al \fIDIR\fP, aunque esto se -puede cambiar utilizando las opciones \fIOPTION\fPs. +For each custom mount \fIDIR\fP must be an absolute path that cannot contain +white spaces or the special . and .. path components, and cannot be /live +(or any of its sub\-directories). Once activated all changes (file deletion, +creation and modification) to \fIDIR\fP on the live file system are stored +persistently into a path equivalent to \fIDIR\fP on the persistence media, +called the source directory. The default way to achieve persistence is to +simply bind\-mount the corresponding source directory to \fIDIR\fP, but this can +be changed through the use of \fIOPTION\fPs. .PP Todos los montajes personalizados serán montados en orden de tal manera que dos montajes personalizados no se "escondan" uno al otro. Por ejemplo, si diff --git a/manpages/es/live-snapshot.es.1 b/manpages/es/live-snapshot.es.1 deleted file mode 100644 index 0fe250c..0000000 --- a/manpages/es/live-snapshot.es.1 +++ /dev/null @@ -1,146 +0,0 @@ -.\"******************************************************************* -.\" -.\" This file was generated with po4a. Translate the source file. -.\" -.\"******************************************************************* -.TH LIVE\-BOOT 1 05.06.2012 3.0~a31\-1 "Proyecto Debian Live" - -.SH NOMBRE -\fBlive\-snapshot\fP \- sencillo script para facilitar el uso de la persistencia - -.SH SINOPSIS -\fBlive\-snapshot\fP [\-c|\-\-cow \fIDIRECTORY] [\-d|\-\-device DEVICE\fP] -[\-e|\-\-exclude\-list \fIFILE\fP] [\-o|\-\-output \fIFILE\fP] [\-t|\-\-type \fITYPE\fP] -.br -\fBlive\-snapshot\fP [\-r|\-\-resync\-string STRING] -.br -\fBlive\-snapshot\fP [\-h|\-\-help] -.br -\fBlive\-snapshot\fP [\-u|\-\-usage] -.br -\fBlive\-snapshot\fP [\-v|\-\-version] - -.SH DESCRIPCIÓN -live\-snapshot es un script que puede ser usado para crear ficheros imagen -adecuados para la persistencia y con soporte en \fIlive\-boot\fP(7). También es -usado por el script init de live\-boot al salir para resincronizar las -instantáneas encontradas en los dispositivos durante el arranque. - -.SH OPCIONES -.IP "\-c, \-\-cow \fIDIRECTORY\fP" 4 -especifica qué directorio debe ser clonado en el fichero imagen. Su valor -por defecto "/live/overlay" debería ser adecuado para la mayoria de -usos. Sin embargo puede ser práctico especificar "/home" y \-\-type ext4 para -preparar un fichero imagen adecuado para ser directamente montado por -live\-boot como home. -.IP "\-d, \-\-device \fIDEVICE\fP" 4 -establece el dispositivo donde los medios con la instantánea/persistencia -fichero/partición será puesto. Si no se especifica, se usará un tmpfs y se -hará un enlace al escritorio del usuario para que pueda moverlo donde sea -necesario. Si el dispositivo no tiene sistema de ficheros, se creará -automáticamente un ext4 fs con una etiqueta de acuerdo a los valores -especificados después del valor "\-\-output" o con un valor por defecto -adecuado. -.IP "\-e, \-\-exclude\-list \fIFILE\fP" 4 -un fichero que contiene una lista de nombres de ficheros/rutas que no deben -guardarse. Esta lista de exclusión será recordada en el medio de la -instantánea objetivo para ser reutilizada. -.IP "\-o, \-\-output \fIFILE\fP" 4 -el nombre del fichero/etiqueta utilizado para el fichero/partición -resultante. Si se deja en blanco, live\-snapshot buscará el fichero adecuado -en el dispositivo o utilizará la partición entera. -.IP "\-r, \-\-resync\-string \fISTRING\fP" 4 -se usa internamente en las resincronizaciones -.IP "\-f, \-\-refresh" 4 -intenta hacer la misma operación que se debería hacer al reiniciar o parar, -resincronizando las instantáneas encontradas automáticamente durante el -arranque. Es práctico para prevenir una averia o una subida de tensión. -.IP "\-t, \-\-type \fITYPE\fP" 4 -El tipo puede ser uno de los siguientes: "cpio", "squashfs", "ext2", "ext3", -"ext4", or "jffs2". -.IP "\-h, \-\-help" 4 -muestra el menú de ayuda y sale. -.IP "\-u, \-\-usage" 4 -muestra el menú de uso y sale. -.IP "\-v, \-\-version" 4 -muestra información de la versión y sale. - -.SH FICHEROS -.IP \fB/etc/live.conf\fP 4 -#\-#\-#\-#\-# live\-snapshot.1.po (live\-snapshot) #\-#\-#\-#\-# -Algunas variables pueden ser configuradas a través de este fichero de -configuración (dentro del sistema en vivo). -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# -Algunas variables pueden ser configuradas a través de este fichero de -configuración (dentro del sistema en vivo). -.IP \fBlive/filesystem.module\fP 4 -#\-#\-#\-#\-# live\-snapshot.1.po (live\-snapshot) #\-#\-#\-#\-# -Este fichero opcional (dentro del medio en vivo) contiene una lista de -nombres de ficheros separados por espacios en blanco o retornos de carro que -corresponden a imágenes de disco en el directorio "/live". Si este fichero -existe, sólo las imágenes que figuran en esta lista se fusionarán en la raíz -aufs y se cargarán en el orden en que aparecen aquí. La primera entrada en -este fichero será el punto "más bajo" en el aufs y el último fichero de esta -lista estará en el punto "más alto" del aufs, justo debajo de /overlay. Sin -este fichero, las imágenes en el directorio "/live" se cargan en orden -alfanumérico. -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# -Este fichero opcional (dentro del medio en vivo) contiene una lista de -nombres de ficheros separados por espacios en blanco o retornos de carro que -corresponden a imágenes de disco en el directorio "/live". Si este fichero -existe, sólo las imágenes que figuran en esta lista se fusionarán en la raíz -aufs, y se cargarán en el orden en que aparecen aquí. La primera entrada en -este fichero será el punto "más bajo" en el aufs y el último fichero de esta -lista estará en el punto "más alto" del aufs, justo debajo de /overlay. Sin -este fichero, las imágenes en el directorio "/live" se cargan en orden -alfanumérico. -.IP \fB/etc/live\-persistence.binds\fP 4 -Este fichero opcional (que reside en el sistema rootfs, no en los medios en -vivo) se utiliza como una lista de directorios que no necesitan ser -persistentes: es decir, su contenido no necesita sobrevivir tras reiniciar -cuando se utiliza la persistencia. -.br -Esto ahorra costosas escrituras y acelera las operaciones sobre los datos -volátiles, tales como las caches web y los archivos temporales (como por -ejemplo, /tmp y .mozilla) que se regeneran cada vez. Esto se logra mediante -un montaje enlazado de cada directorio de la lista con un tmpfs en la ruta -original. -.IP \fB/etc/live\-snapshot.list\fP 4 -Este fichero opcional, si existe, cambia el comportamiento de live\-snapshot: -únicamente se incluyen (integramente) en la instantánea los ficheros y los -directorios listados allí. Tener cuidado, ésta es una funcionalidad -experimental que sólo funciona con objetivos cpio en este momento. - -.SH "VER ADEMÁS" -\fIlive\-boot\fP(1) -.PP -\fIlive\-build\fP(7) -.PP -\fIlive\-config\fP(7) -.PP -\fIlive\-tools\fP(7) - -.SH "PÁGINA WEB" -#\-#\-#\-#\-# live\-snapshot.1.po (live\-snapshot) #\-#\-#\-#\-# -Se puede encontrar más información acerca de live\-boot y el proyecto Debian -Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual -<\fIhttp://live.debian.net/manual/\fP>. -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# -Se puede encontrar más información acerca de live\-boot y el proyecto Debian -Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en -<\fIhttp://live.debian.net/manual/\fP>. -#\-#\-#\-#\-# live\-persistence.conf.5.po (live\-persistence.conf) #\-#\-#\-#\-# -Se puede encontrar más información acerca de live\-boot y el proyecto Debian -Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en -<\fIhttp://live.debian.net/manual/\fP>. - -.SH ERRORES -Se puede notificar los fallos enviando un informe de errores sobre el -paquete live\-boot en el Debian Bug Tracking System en -<\fIhttp://bugs.debian.org/\fP> o escribiendo un mensaje a la lista de -correo de Debian Live a la dirección -<\fIdebian\-live@lists.debian.org\fP>. - -.SH AUTOR -live\-boot fue escrito por Daniel Baumann <\fIdaniel@debian.org\fP> para -el proyecto Debian. diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index f6e46e5..16308c3 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a31-1\n" -"POT-Creation-Date: 2012-06-05 21:45+0300\n" +"Project-Id-Version: live-boot 3.0~a32-1\n" +"POT-Creation-Date: 2012-06-06 19:02+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -16,31 +16,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-06-05" -msgstr "05.06.2012" +msgid "2012-06-06" +msgstr "06.06.2012" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a31-1" +msgid "3.0~a32-1" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3 +#: en/live-boot.7:3 en/live-persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "" @@ -51,7 +51,7 @@ msgid "B - System Boot Scripts" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17 +#: en/live-boot.7:6 en/live-persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -137,7 +137,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20 +#: en/live-boot.7:28 en/live-persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "" @@ -571,16 +571,10 @@ msgstr "" #: en/live-boot.7:113 msgid "" "live-boot will probe devices for persistence media. These can be partitions " -"(with the correct GPT name), filesystems (with the correct label) or image/" -"archive files (with the correct file name). Overlays are labeled/named " -"either \"full-ov\", which will be mounted on /, or \"custom-ov\", which can " -"be completely customized (see I(5)); snapshots are " -"labeled/named either \"live-sn\" or \"home-sn\" and will be extracted into / " -"or /home, respectively (see I(1) for more information). The " -"order these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay " -"image files and snapshot archive files have extensions which determines " -"their filesystem or archive type, e.g. \"custom-ov.ext4\" and \"home-sn." -"squashfs\"." +"(with the correct GPT name), filesystems (with the correct label) or image " +"files (with the correct file name). Overlays are labeled/named \"persistence" +"\" (see I(5)). Overlay image files have extensions " +"which determines their filesystem, e.g. \"persistence.ext4\"." msgstr "" #. type: IP @@ -609,9 +603,9 @@ msgstr "" #: en/live-boot.7:117 msgid "" "If you specify the keyword 'removable', live-boot will try to find " -"persistence and snapshot partitions on removable media only. Note that if " -"you want to further restrict the media to usb mass storage only, you can use " -"the 'removable-usb' keyword." +"persistence partitions on removable media only. Note that if you want to " +"further restrict the media to usb mass storage only, you can use the " +"'removable-usb' keyword." msgstr "" #. type: IP @@ -625,8 +619,7 @@ msgstr "" msgid "" "This option determines which types of persistence media we allow. If " "\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and " -"\"home-rw\"); if \"snapshot\" is in the list, we consider snapshots (i.e. " -"\"live-sn\" and \"home-sn\"). The default is \"overlay,snapshot\"." +"\"home-rw\"). The default is \"overlay\"." msgstr "" #. type: IP @@ -653,8 +646,7 @@ msgstr "" #: en/live-boot.7:123 msgid "" "Filesystem changes are not saved back to persistence media. In particular, " -"overlays and netboot NFS mounts are mounted read-only, and snapshots are not " -"resynced on shutdown." +"overlays and netboot NFS mounts are mounted read-only." msgstr "" #. type: IP @@ -782,26 +774,27 @@ msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:143 en/live-snapshot.1:43 +#: en/live-boot.7:143 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:145 en/live-snapshot.1:45 +#: en/live-boot.7:145 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:145 en/live-snapshot.1:45 +#: en/live-boot.7:145 #, no-wrap msgid "B" msgstr "" +#. FIXME #. type: Plain text -#: en/live-boot.7:147 en/live-snapshot.1:47 +#: en/live-boot.7:148 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -813,105 +806,76 @@ msgid "" "are loaded in alphanumeric order." msgstr "" -#. type: IP -#: en/live-boot.7:147 en/live-snapshot.1:47 -#, no-wrap -msgid "B" -msgstr "" - -#. type: Plain text -#: en/live-boot.7:149 -msgid "" -"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." -msgstr "" - -#. type: Plain text -#: en/live-boot.7:152 en/live-snapshot.1:51 -msgid "" -"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." -msgstr "" - #. type: SH -#: en/live-boot.7:153 en/live-snapshot.1:42 +#: en/live-boot.7:149 #, no-wrap msgid "FILES" msgstr "" #. type: IP -#: en/live-boot.7:154 +#: en/live-boot.7:150 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:155 +#: en/live-boot.7:151 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:156 +#: en/live-boot.7:152 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:157 +#: en/live-boot.7:153 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:158 +#: en/live-boot.7:154 #, no-wrap msgid "B" msgstr "" #. type: SH -#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54 +#: en/live-boot.7:156 en/live-persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:162 -msgid "I(1)" -msgstr "" - -#. type: Plain text -#: en/live-boot.7:164 +#: en/live-boot.7:158 msgid "I(5)" msgstr "" #. type: Plain text -#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58 +#: en/live-boot.7:160 en/live-persistence.conf.5:195 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60 +#: en/live-boot.7:162 en/live-persistence.conf.5:197 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62 +#: en/live-boot.7:164 en/live-persistence.conf.5:199 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63 +#: en/live-boot.7:165 en/live-persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:173 en/live-persistence.conf.5:204 en/live-snapshot.1:65 +#: en/live-boot.7:167 en/live-persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -919,13 +883,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66 +#: en/live-boot.7:168 en/live-persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:176 en/live-persistence.conf.5:210 en/live-snapshot.1:68 +#: en/live-boot.7:170 en/live-persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -934,13 +898,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69 +#: en/live-boot.7:171 en/live-persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:178 en/live-snapshot.1:70 +#: en/live-boot.7:172 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po index 0c2111b..b2ea419 100644 --- a/manpages/po/de/live-persistence.conf.5.po +++ b/manpages/po/de/live-persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a31-1\n" -"POT-Creation-Date: 2012-06-05 21:45+0300\n" +"Project-Id-Version: live-boot 3.0~a32-1\n" +"POT-Creation-Date: 2012-06-06 19:02+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -16,76 +16,76 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap msgid "LIVE-BOOT" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-06-05" -msgstr "05.06.2012" +msgid "2012-06-06" +msgstr "06.06.2012" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a31-1" +msgid "3.0~a32-1" msgstr "" #. type: TH -#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1 +#: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap msgid "Debian Live Project" msgstr "" #. type: SH -#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3 +#: en/live-boot.7:3 en/live-persistence.conf.5:3 #, no-wrap msgid "NAME" msgstr "" #. type: SH -#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17 +#: en/live-boot.7:6 en/live-persistence.conf.5:7 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: SH -#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20 +#: en/live-boot.7:28 en/live-persistence.conf.5:57 #, no-wrap msgid "OPTIONS" msgstr "" #. type: SH -#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54 +#: en/live-boot.7:156 en/live-persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58 +#: en/live-boot.7:160 en/live-persistence.conf.5:195 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60 +#: en/live-boot.7:162 en/live-persistence.conf.5:197 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62 +#: en/live-boot.7:164 en/live-persistence.conf.5:199 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63 +#: en/live-boot.7:165 en/live-persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:173 en/live-persistence.conf.5:204 en/live-snapshot.1:65 +#: en/live-boot.7:167 en/live-persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -93,13 +93,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66 +#: en/live-boot.7:168 en/live-persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:176 en/live-persistence.conf.5:210 en/live-snapshot.1:68 +#: en/live-boot.7:170 en/live-persistence.conf.5:210 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -108,7 +108,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69 +#: en/live-boot.7:171 en/live-persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" @@ -124,7 +124,7 @@ msgstr "" #: en/live-persistence.conf.5:13 msgid "" "If live-boot probes a persistence volume with the label (or GPT name, or " -"file name, but from now on we will just say \"label\") \"custom-ov\", that " +"file name, but from now on we will just say \"label\") \"persistence\", that " "volume's persistence is fully customizable through the B file stored on the root of its file system. Any such labeled volume " "must have such a file, or it will be ignored." @@ -155,13 +155,12 @@ msgstr "" msgid "" "For each custom mount I must be an absolute path that cannot contain " "white spaces or the special . and .. path components, and cannot be /live " -"(or any of its sub-directories), or / (for the latter, use \"full-ov\" " -"persistence instead). Once activated all changes (file deletion, creation " -"and modification) to I on the live file system are stored persistently " -"into a path equivalent to I on the persistence media, called the source " -"directory. The default way to achieve persistence is to simply bind-mount " -"the corresponding source directory to I, but this can be changed " -"through the use of I