diff options
33 files changed, 2388 insertions, 620 deletions
@@ -1 +1 @@ -3.0.1-1 +4.0~a1-1 diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index d66c669..3860f4c 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -143,19 +143,11 @@ then copy_exec /usr/bin/eject /bin fi -# Program: mount -# fuse does not work with klibc mount -copy_exec /bin/mount /bin/mount.util-linux - [ "${QUIET}" ] || echo -n " utils" # Feature: Verify Checksums -if [ -e /etc/progress-linux_version ] -then - copy_exec /usr/bin/sha256sum /bin -else - copy_exec /usr/bin/md5sum /bin -fi +copy_exec /usr/bin/sha256sum /bin +copy_exec /usr/bin/md5sum /bin # Program: memdisk if [ -x /usr/bin/memdiskfind ] @@ -244,4 +236,14 @@ case "${LIVE_DNS}" in ;; esac +case "${LIVE_UNIONMOUNT}" in + true) + [ "${QUIET}" ] || echo -n " unionmount" + + # UnionMount + # only mount from patched util-linux can do this currently + copy_exec /bin/mount /bin/mount_full + ;; +esac + [ "${QUIET}" ] || echo . diff --git a/debian/changelog b/debian/changelog index 34343bd..d4ac46c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,94 +1,8 @@ -live-boot (3.0.1-1) unstable; urgency=low +live-boot (4.0~a1-1) experimental; urgency=low - [ chals ] - * Updating Spanish translation of live-boot man page, persistence-label. - - [ Daniel Baumann ] - * Dropping German manpage translations stubs for the release. - - -- Daniel Baumann <daniel@debian.org> Thu, 14 Feb 2013 19:33:17 +0100 - -live-boot (3.0.0-1) unstable; urgency=low - - [ Daniel Baumann ] - * Updating manpage year handling for 2013. - - [ Richard Nelson ] - * Replace noprompt with noeject on manpage. - - [ Daniel Baumann ] - * Updating noeject description in manpage. - - [ chals ] - * Updating Spanish translation in respect to noeject. - - [ Daniel Baumann ] - * Dropping dpkg compression level. - * Calling df with -P to avoid line wraps with overly long mountpoints. - - [ Tails developers ] - * Improving test for /etc/fstab.d support by testing for its existence - instead of /run's one. - - [ Daniel Baumann ] - * Removing some dead code in netbase parts. - - [ Gaudenz Steinlin ] - * Fixing support for multiple squashfs images (Closes: #696494). - * Fixing mounting of rootfs, cow and medium filesystems (Closes: - #696495). - - [ Daniel Baumann ] - * Correcting persistence-label handling fwrt/ legacy live-boot 2.x - support, thanks to Mike Gach <gach.mqt@gmail.com> (Closes: #697873). - - -- Daniel Baumann <daniel@debian.org> Tue, 12 Feb 2013 08:23:17 +0100 - -live-boot (3.0~b11-1) unstable; urgency=low - - * Updating year in copyright file. - * Supporting legacy filenames for checksums in debian within verify- - checksums. - * Correcting legacy filename for checksum files. - * By default including sha256sum only in progress-linux, keep md5sum - legacy for debian. - - -- Daniel Baumann <daniel@debian.org> Wed, 02 Jan 2013 11:32:21 +0100 - -live-boot (3.0~b10-1) unstable; urgency=low - - [ Daniel Baumann ] - * Adding live-tools to recommends. - - [ Michal Suchanek ] - * Including util-linux mount in initramfs. - - [ Daniel Baumann ] - * Making overwriting of /bin/mount within initramfs with mount.util- - linux dependent on fuse usage, not on some additional boot parameter. - * Correcting spelling typo in bug script. - - [ Richard Nelson ] - * Update manpage information of ip= param to correctly reflect what - 9990-netbase.sh expects. - - [ Daniel Baumann ] - * Cleaning up manpage po files. - - [ Evgeni Golov ] - * Do not fix mountpoints with live-persistence.conf as home-rw/live-rw. - - -- Daniel Baumann <daniel@debian.org> Mon, 17 Dec 2012 20:22:50 +0100 - -live-boot (3.0~b9-1) unstable; urgency=low - - [ Tails developers ] - * Making the /live to /lib/live move for the persistence code. - * Handling already mounted persistence backing media correctly. - * Fixing persistence-media option when no devices are attached. - * Using 'local' in a safe way. + * Dropping specifics for squeeze based distributions. - -- Daniel Baumann <daniel@debian.org> Mon, 10 Dec 2012 20:01:21 +0100 + -- Daniel Baumann <daniel@debian.org> Fri, 30 Nov 2012 14:58:46 +0100 live-boot (3.0~b8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index ae41843..a0561dc 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Vcs-Git: git://live.debian.net/git/live-boot.git Package: live-boot Architecture: all Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend -Recommends: live-boot-doc, live-tools, rsync, uuid-runtime +Recommends: live-boot-doc, rsync, uuid-runtime Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget Description: Live System Boot Scripts live-boot contains the scripts that configure a live system during the boot @@ -25,8 +25,6 @@ Package: live-boot-doc Section: doc Architecture: all Depends: ${misc:Depends} -Conflicts: live-boot (<< 3.0~a18~) -Replaces: live-boot Description: Live System Boot Scripts (documentation) live-boot contains the scripts that configure a live system during the boot process (early userspace). diff --git a/debian/copyright b/debian/copyright index d1c1b8a..9687245 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Debian Live Project <debian-live@lists.debian.org> Source: http://live.debian.net/archive/packages/live-boot/ Files: * -Copyright: 2006-2013 Daniel Baumann <daniel@debian.org> +Copyright: 2006-2012 Daniel Baumann <daniel@debian.org> 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.bug-presubj b/debian/live-boot.bug-presubj index 90a72ec..8b18276 100644 --- a/debian/live-boot.bug-presubj +++ b/debian/live-boot.bug-presubj @@ -1,9 +1,9 @@ Before submitting a bug report against live-boot, please make sure -that you have read our guidelines for Debian Live bug reports: +that you have read our guidlines for Debian Live bug reports: http://live.debian.net/manual/ -By providing the required information as outlined in the guidelines makes +By providing the required information as outlined in the guidlines makes sure that we can optimally reproduce and fix bugs, not doing so wastes a lot of time for both the maintainers and the submitters. diff --git a/debian/rules b/debian/rules index ba9bb63..37418ee 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ override_dh_auto_install: mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share override_dh_builddeb: - dh_builddeb -- -Zxz + dh_builddeb -- -Zxz -z9 override_dh_install: dh_install --fail-missing diff --git a/debian/source/options b/debian/source/options index 5bd47b7..22a4de9 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1,2 @@ compression = xz +compression-level = 9 diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh index 1f7b7d3..6326ada 100755 --- a/manpages/bin/update-version.sh +++ b/manpages/bin/update-version.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-boot(7) - System Boot Scripts -## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org> +## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org> ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -35,9 +35,7 @@ do then for _FILE in po/${_LANGUAGE}/*.po do - sed -i -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ - -e "s|^msgstr .*.2013\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ - "${_FILE}" + sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}" done fi done @@ -47,8 +45,6 @@ if ls po/pt_BR/*.po > /dev/null 2>&1 then for _FILE in po/pt_BR/*.po do - sed -i -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ - -e "s|^msgstr .*-2013\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ - "${_FILE}" + sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}" done fi diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 new file mode 100644 index 0000000..ae21ae1 --- /dev/null +++ b/manpages/de/live-boot.de.7 @@ -0,0 +1,290 @@ +.\"******************************************************************* +.\" +.\" This file was generated with po4a. Translate the source file. +.\" +.\"******************************************************************* +.TH LIVE\-BOOT 7 30.11.2012 4.0~a1\-1 "Debian Live Project" + +.SH NAME +\fBlive\-boot\fP \- System Boot Scripts + +.SH DESCRIPTION +\fBlive\-boot\fP contains the scripts that configure a Debian Live system during +the boot process (early userspace). +.PP +.\" FIXME +live\-boot is a hook for the initramfs\-tools, used to generate a initramfs +capable to boot live systems, such as those created by +\fIlive\-helper\fP(7). This includes the Debian Live isos, netboot tarballs, and +usb stick images. +.PP +.\" FIXME +At boot time it will look for a (read\-only) media containing a "/live" +directory where a root filesystems (often a compressed filesystem image like +squashfs) is stored. If found, it will create a writable environment, using +aufs, for Debian like systems to boot from. + +.SH CONFIGURATION +\fBlive\-boot\fP can be configured through a boot parameter or a configuration +file. +.PP +To configure the live\-boot parameters used by default in a live image, see +the \-\-bootappend\-live option in the \fIlb_config\fP(1) manual page. + +.SS "Kernel Parameters" +\fBlive\-boot\fP is only activated if 'boot=live' was used as a kernel +parameter. +.PP +In addition, there are some more boot parameters to influence the behaviour, +see below. + +.SS "Configuration Files" +\fBlive\-boot\fP can be configured (but not activated) through configuration +files. Those files can be placed either in the root filesystem itself +(/etc/live/boot.conf, /etc/live/boot/*), or on the live media +(live/boot.conf, live/boot/*). + +.SH OPTIONS +.\" FIXME +\fBlive\-boot\fP currently features the following parameters. +.IP \fBaccess\fP=\fIACCESS\fP 4 +Set the accessibility level for physically or visually impaired +users. ACCESS must be one of v1, v2, v3, m1, or m2. v1=lesser visual +impairment, v2=moderate visual impairment, v3=blindness, m1=minor motor +difficulties, m2=moderate motor difficulties. +.IP \fBconsole\fP=\fITTY,SPEED\fP 4 +Set the default console to be used with the "live\-getty" option. Example: +"console=ttyS0,115200" +.IP \fBdebug\fP 4 +Makes initramfs boot process more verbose. +.br +Use: debug=1 +.br +Without setting debug to a value the messages may not be shown. +.IP \fBfetch\fP=\fIURL\fP 4 +.IP \fBhttpfs\fP=\fIURL\fP 4 +Another form of netboot by downloading a squashfs image from a given url. +The fetch method copies the image to ram and the httpfs method uses fuse and +httpfs2 to mount the image in place. Copying to ram requires more memory and +might take a long time for large images. However, it is more likely to work +correctly because it does not require networking afterwards and the system +operates faster once booted because it does not require to contact the +server anymore. +.br +Due to current limitations in busybox's wget and DNS resolution, an URL can +not contain a hostname but an IP only. +.br +Not working: http://example.com/path/to/your_filesystem.squashfs +.br +Working: http://1.2.3.4/path/to/your_filesystem.squashfs +.br +Also note that therefore it's currently not possible to fetch an image from +a namebased virtualhost of an httpd if it is sharing the ip with the main +httpd instance. +.br +You may also use the live iso image in place of the squashfs image. +.IP \fBiscsi\fP=\fIserver\-ip[,server\-port];target\-name\fP 4 +Boot from an iSCSI target that has an iso or disk live image as one of its +LUNs. The specified target is searched for a LUN which looks like a live +media. If you use the \fBiscsitarget\fP software iSCSI target solution which is +packaged in Debian your ietd.conf might look like this: +.br +# The target\-name you specify in the iscsi= parameter +.br +Target <target\-name> + Lun 0 Path=<path\-to\-your\-live\-image.iso>,Type=fileio,IOMode=ro + # If you want to boot multiple machines you might want to look at tuning some parameters like + # Wthreads or MaxConnections +.IP \fBfindiso\fP=\fI/PATH/TO/IMAGE\fP 4 +Look for the specified ISO file on all disks where it usually looks for the +\&.squashfs file (so you don't have to know the device name as in +fromiso=....). +.IP \fBfromiso\fP=\fI/PATH/TO/IMAGE\fP 4 +Allows to use a filesystem from within an iso image that's available on +live\-media. +.IP \fBignore_uuid\fP 4 +Do not check that any UUID embedded in the initramfs matches the discovered +medium. live\-boot may be told to generate a UUID by setting +LIVE_GENERATE_UUID=1 when building the initramfs. +.IP \fBverify\-checksums\fP 4 +If specified, an MD5 sum is calculated on the live media during boot and +compared to the value found in md5sum.txt found in the root directory of the +live media. +.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4 +Let you specify the name(s) and the options of the interface(s) that should +be configured at boot time. Do not specify this if you want to use dhcp +(default). It will be changed in a future release to mimick official kernel +boot param specification +(e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp). +.IP \fBip\fP=[\fIfrommedia\fP] 4 +If this variable is set, dhcp and static configuration are just skipped and +the system will use the (must be) media\-preconfigured +/etc/network/interfaces instead. +.IP {\fBlive\-media\fP|\fBbootfrom\fP}=\fIDEVICE\fP 4 +If you specify one of this two equivalent forms, live\-boot will first try to +find this device for the "/live" directory where the read\-only root +filesystem should reside. If it did not find something usable, the normal +scan for block devices is performed. +.br +Instead of specifing an actual device name, the keyword 'removable' can be +used to limit the search of acceptable live media to removable type +only. Note that if you want to further restrict the media to usb mass +storage only, you can use the 'removable\-usb' keyword. +.IP {\fBlive\-media\-encryption\fP|\fBencryption\fP}=\fITYPE\fP 4 +live\-boot will mount the encrypted rootfs TYPE, asking the passphrase, +useful to build paranoid live systems :\-). TYPE supported so far are "aes" +for loop\-aes encryption type. +.IP \fBlive\-media\-offset\fP=\fIBYTES\fP 4 +This way you could tell live\-boot that your image starts at offset BYTES in +the above specified or autodiscovered device, this could be useful to hide +the Debian Live iso or image inside another iso or image, to create "clean" +images. +.IP \fBlive\-media\-path\fP=\fIPATH\fP 4 +Sets the path to the live filesystem on the medium. By default, it is set to +\&'/live' and you should not change that unless you have customized your media +accordingly. +.IP \fBlive\-media\-timeout\fP=\fISECONDS\fP 4 +Set the timeout in seconds for the device specified by "live\-media=" to +become ready before giving up. +.IP \fBmodule\fP=\fINAME\fP 4 +Instead of using the default optional file "filesystem.module" (see below) +another file could be specified without the extension ".module"; it should +be placed on "/live" directory of the live medium. +.IP \fBnetboot\fP[=nfs|cifs] 4 +This tells live\-boot to perform a network mount. The parameter "nfsroot=" +(with optional "nfsopts="), should specify where is the location of the root +filesystem. With no args, will try cifs first, and if it fails nfs. +.IP \fBnfsopts\fP= 4 +This lets you specify custom nfs options. +.IP \fBnofastboot\fP 4 +This parameter disables the default disabling of filesystem checks in +/etc/fstab. If you have static filesystems on your harddisk and you want +them to be checked at boot time, use this parameter, otherwise they are +skipped. +.IP \fBnopersistence\fP 4 +disables the "persistence" feature, useful if the bootloader (like syslinux) +has been installed with persistence enabled. +.IP \fBnoprompt\fP 4 +Do not prompt to eject the CD or remove the USB flash drive on reboot. +.IP \fBnoprompt\fP=\fITYPE\fP 4 +This tells live\-boot not to prompt to eject the CD (when noprompt=cd) or +remove the USB flash drive (when noprompt=usb) on reboot. +.IP \fBramdisk\-size\fP 4 +This parameters allows to set a custom ramdisk size (it's the '\-o size' +option of tmpfs mount). By default, there is no ramdisk size set, so the +default of mount applies (currently 50% of available RAM). Note that this +option has no currently no effect when booting with toram. +.IP \fBswapon\fP 4 +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 +files (with the correct file name). Overlays are labeled/named "persistence" +(see \fIpersistence.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 +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\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4 +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 +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 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. +.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 +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\fP=\fISUFFIX\fP 4 +Add a suffix when searching for the image filenames or partition labels to +use for the above mentioned persistence feature, the SUFFIX will be added +after a dash (e.g.: "live\-sn" would transform to "live\-sn\-SUFFIX"). This is +handy to test multiple live\-boot based live\-systems with different +persistence storage choices. +.IP \fBquickreboot\fP 4 +This option causes live\-boot to reboot without attempting to eject the media +and without asking the user to remove the boot media. +.IP \fBshowmounts\fP 4 +This parameter will make live\-boot to show on "/" the ro filesystems (mostly +compressed) on "/lib/live". This is not enabled by default because could +lead to problems by applications like "mono" which store binary paths on +installation. +.IP \fBsilent\fP 4 +If you boot with the normal quiet parameter, live\-boot hides most messages +of its own. When adding silent, it hides all. +.IP \fBtodisk\fP=\fIDEVICE\fP 4 +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\fP 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\fP=aufs|unionfs 4 +.\" FIXME +By default, live\-boot uses aufs. With this parameter, you can switch to +unionfs. + +.\" FIXME +.SH "FILES (old)" +.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 +.\" 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 +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. + +.SH FILES +.IP \fB/etc/live/boot.conf\fP 4 +.IP \fB/etc/live/boot/*\fP 4 +.IP \fBlive/boot.conf\fP 4 +.IP \fBlive/boot/*\fP 4 +.IP \fBpersistence.conf\fP 4 + +.SH "SEE ALSO" +\fIpersistence.conf\fP(5) +.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/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 new file mode 100644 index 0000000..c8d2d5d --- /dev/null +++ b/manpages/de/persistence.conf.de.5 @@ -0,0 +1,207 @@ +.\"******************************************************************* +.\" +.\" This file was generated with po4a. Translate the source file. +.\" +.\"******************************************************************* +.TH LIVE\-BOOT conf 30.11.2012 4.0~a1\-1 "Debian Live Project" + +.SH NAME +\fBpersistence.conf\fP \- Configuration file for persistence media in 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") "persistence", that +volume's persistence is fully customizable through the \fBpersistence.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 +The format of \fBpersistence.conf\fP allows empty lines and lines starting with +a "#" (used for comments), both which will be ignored. A so called "custom +mount" has the format: +.PP +.RS +\fIDIR\fP [\fIOPTION\fP]... +.RE +.PP +which roughly translates to "make \fIDIR\fP persistence in the way described by +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). 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 +would always be the case that /a is mounted first, then /a/b. This remains +true no matter how the lines in \fBpersistence.conf\fP are ordered, or if +several \fBpersistence.conf\fP files on different persistence media are used at +the same time. However, it is forbidden for custom mounts to have their +source directory inside the source directory of another custom mount, so the +source directories that are auto\-created by live\-boot does not support +"nested" mounts like /a and /a/b on the same media. In this case you must +use the \fBsource\fP option (see below) to make sure that they are stored in +different source directories. +.PP +When a source directory doesn't exist on the persistence media for a certain +custom mount, it will be created automatically, and permissions and +ownership will be optimistically set according to \fIDIR\fP. It will also be +bootstrapped by copying the contents of the \fIDIR\fP into its source directory +on the persistence media. The bootstrapping will not happen when the \fBlink\fP +or \fBunion\fP options are used (see below). + +.SH OPTIONS +Custom mounts defined in \fBpersistence.conf\fP accept the following options in +a coma\-separated list: +.IP \fBsource\fP=\fIPATH\fP 4 +When given, store the persistence changes into \fIPATH\fP on the persistence +media. \fIPATH\fP must be a relative path (with respect to the persistence +media root) that cannot contain white spaces or the special . or .. path +components, with the exception that it can be just . which means the +persistence media root. This option is mostly relevant if you want to nest +custom mounts, which otherwise would cause errors, or if you want to make +the whole media root available (similar to the now deprecated \fBhome\-rw\fP +type of persistence). +.PP +The following options are mutually exclusive (only the last given one will +be in effect): +.IP \fBbind\fP 4 +Bind\-mount the source directory to \fIDIR\fP. This is the default. +.IP \fBlink\fP 4 +Create the directory structure of the source directory on the persistence +media in \fIDIR\fP and create symbolic links from the corresponding place in +\fIDIR\fP to each file in the source directory. Existing files or directories +with the same name as any link will be overwritten. Note that deleting the +links in \fIDIR\fP will only remove the link, not the corresponding file in the +source; removed links will reappear after a reboot. To permanently add or +delete a file one must do so directly in the source directory. +.IP +Effectively \fBlink\fP will make only files already in the source directory +persistent, not any other files in \fIDIR\fP. These files must be manually +added to the source directory to make use of this option, and they will +appear in \fIDIR\fP in addition to files already there. This option is useful +when only certain files need to be persistent, not the whole directory +they're in, e.g. some configuration files in a user's home directory. +.IP \fBunion\fP 4 +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 +bind\-mounts, and will not hide files added to the read\-only media. One +caveat is that the union will use \fIDIR\fP 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\fP boot parameter, but is not +supported with \fBunion=unionmount\fP. + +.SH DIRECTORIES +.IP \fB/live/persistence\fP 4 +All persistence volumes will be mounted here (in a directory corresponding +to the device name). The \fBpersistence.conf\fP file can easily be edited +through this mount, as well as any source directories (which is especially +practical for custom mounts using the \fBlink\fP option). + +.SH EXAMPLES + +Let's say we have a persistence volume \fIVOL\fP with the a \fBpersistence.conf\fP +file containing the following four lines (numbered for ease of reference): +.TP 7 +1. +/home/user1 link,source=config\-files/user1 +.TP +2. +/home/user2 link,source=config\-files/user2 +.TP +3. +/home +.TP +4. +/usr union +.PP +The corresponding source directories are: +.TP 7 +1. +\fIVOL\fP/config\-files/user1 (but it would be \fIVOL\fP/home/user1 without the +\fBsource\fP option) +.TP +2. +\fIVOL\fP/config\-files/user2 (but it would be \fIVOL\fP/home/user2 without the +\fBsource\fP option) +.TP +3. +\fIVOL\fP/home +.TP +4. +\fIVOL\fP/usr +.PP +It was necessary to set the \fBsource\fP options for 1 and 2, since they +otherwise would become nested with 3's source, which is invalid. +.PP +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, \fIVOL\fP/home +is simply bind\-mounted on /home. To illustrate what happens for lines 1 and +2, let's say that the following files exist: +.TP 7 +a. +\fIVOL\fP/config\-files/user1/.emacs +.TP +b. +\fIVOL\fP/config\-files/user2/.bashrc +.TP +c. +\fIVOL\fP/config\-files/user2/.ssh/config +.PP +Then the following links and directories will be created: +.TP 7 +Link: +/home/user1/.emacs \-> \fIVOL\fP/config\-files/user1/.emacs (from a) +.TP +Link: +/home/user2/.bashrc \-> \fIVOL\fP/config\-files/user2/.bashrc (from b) +.TP +Dir: +/homea/user2/.ssh (from c) +.TP +Link: +/home/user2/.ssh/config \-> \fIVOL\fP/config\-files/user2/.ssh/config (from +c) +.PP +One could argue, though, that lines 1 and 2 in the example +\fBpersistence.conf\fP file above are unnecessary since line 3 already would +make all of /home persistent. The \fBlink\fP option is intended for situations +where you don't want a complete directory to be persistent, only certain +files in it or its sub\-directories. +.PP +Line 4 can be mounted at any time since its \fIDIR\fP (and source directory) is +completely disjoint from all the other custom mounts. When mounted, +\fIVOL\fP/usr will be the rw branch due to the \fBunion\fP option, and will only +contain the difference compared to the underlying read\-only file +system. Hence packages could be installed into /usr with great space\-wise +efficiency compared to bind\-mounts, since in the latter case all of /usr +would have to be copied into \fIVOL\fP/usr during the initial bootstrap. + +.SH "SEE ALSO" +\fIlive\-boot\fP(7) +.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 +persistence.conf was written by anonym <\fIanonym@lavabit.com\fP> for +the Debian project. diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 4cdd0ac..2dfe725 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2013\-02\-14 3.0.1-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-11\-30 4.0~a1-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts @@ -74,7 +74,7 @@ Allows to use a filesystem from within an iso image that's available on live-med Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs. .IP "\fBverify\-checksums\fR" 4 If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of the live media. -.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fINETMASK\fR]:[\fIGATEWAY_IP\fR]:[\fINAMESERVER\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fINETMASK\fR]:[\fIGATEWAY_IP\fR]:[\fINAMESERVER\fR]]" 4 +.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR]]" 4 Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp). .IP "\fBip\fR=[\fIfrommedia\fR]" 4 If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead. @@ -100,8 +100,10 @@ This lets you specify custom nfs options. This parameter disables the default disabling of filesystem checks in /etc/fstab. If you have static filesystems on your harddisk and you want them to be checked at boot time, use this parameter, otherwise they are skipped. .IP "\fBnopersistence\fR" 4 disables the "persistence" feature, useful if the bootloader (like syslinux) has been installed with persistence enabled. -.IP "\fBnoeject\fR" 4 -Do not prompt to eject the live medium. +.IP "\fBnoprompt\fR" 4 +Do not prompt to eject the CD or remove the USB flash drive on reboot. +.IP "\fBnoprompt\fR=\fITYPE\fR" 4 +This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove the USB flash drive (when noprompt=usb) on reboot. .IP "\fBramdisk\-size\fR" 4 This parameters allows to set a custom ramdisk size (it's the '\-o size' option of tmpfs mount). By default, there is no ramdisk size set, so the default of mount applies (currently 50% of available RAM). Note that this option has no currently no effect when booting with toram. .IP "\fBswapon\fR" 4 @@ -120,8 +122,8 @@ live\-boot will look for persistency files in the root directory of a partition, 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\-label\fR=\fILABEL\fR" 4 -live-boot will use the name "LABEL" instead of "persistence" when searching for persistent storage. LABEL can be any valid filename, partition label, or GPT name. This option replaces the less flexible persistent\-subtext option from version 2 of live-boot. If you wish to continue using legacy names for persistent storage, use the full name with this option, e.g. persistence\-label=live-rw-foo +.IP "\fBpersistence\-subtext\fR=\fISUFFIX\fR" 4 +Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistence feature, the SUFFIX will be added after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistence storage choices. .IP "\fBquickreboot\fR" 4 This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media. .IP "\fBshowmounts\fR" 4 diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index f31a57a..37f69ef 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2013\-02\-14 3.0.1-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-11\-30 4.0~a1-1 "Debian Live Project" .SH NAME \fBpersistence.conf\fR \- Configuration file for persistence media in diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index a175d05..e303e1e 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 14.02.2013 3.0.1\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 30.11.2012 4.0~a1\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema @@ -116,7 +116,7 @@ configurando LIVE_GENERATE_UUID=1 en el momento de crear el initramfs. Si se especifica, se calcula una suma MD5 sobre los medios en vivo durante el arranque y se compara con el valor md5sum.txt que se encuentra en el directorio raíz de los medios en vivo. -.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP]]" 4 +.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4 Permite especificar el nombre(s) y las opciones de la interfaz(ces) que se debe configurar en el arranque. No especificar esta opción si se desea utilizar DHCP (opción por defecto). Esto cambiará en una futura versión para @@ -173,8 +173,11 @@ utilizar este parámetro, de lo contrario, se omite. .IP \fBnopersistence\fP 4 desactiva la "persistencia", es útil si el gestor de arranque (como syslinux) se ha instalado con persistencia habilitada. -.IP \fBnoeject\fP 4 -No pedir que se extraiga el dispositivo en vivo. +.IP \fBnoprompt\fP 4 +No preguntar para expulsar el CD o extraer la unidad flash USB al reiniciar. +.IP \fBnoprompt\fP=\fITYPE\fP 4 +Indica a live\-boot que no pregunte para expulsar el CD (usando noprompt=cd) +o extraer la unidad flash USB (usando noprompt=usb) al reiniciar. .IP \fBramdisk\-size\fP 4 Este parámetro permite establecer un tamaño de disco RAM personalizado (que es la opción '\-o size' del montaje tmpfs). No hay un tamaño de ramdisk @@ -222,10 +225,13 @@ está en la lista, se usarán los sistemas de ficheros que tengan su etiqueta correspondiente; si "file" está en la lista, todos los sistemas de ficheros se probarán buscando ficheros y ficheros imagen con sus etiquetas correspondientes. Por defecto es "file,filesystem". -.IP \fBpersistence\-label\fP=\fILABEL\fP 4 -live\-boot utilizará el nombre "LABEL" en lugar de "persistence" cuando -busque medios de almacenamiento persistente. LABEL puede ser cualquier -nombre de fichero, etiqueta de una partición or nombre GPT. +.IP \fBpersistence\-subtext\fP=\fISUFFIX\fP 4 +Añadir un sufijo cuando se buscan los nombres de las imágenes o etiquetas de +las particiones a utilizar para la función de la persistencia mencionada +anteriormente, el SUFFIX se añadirá después de un guión (por ejemplo: +"live\-sn" se transformaría en "live\-sn\-SUFFIX"). Esto es útil para probar +múltiples sistemas en vivo basados en live\-boot con diferentes opciones de +almacenamiento con persistencia. .IP \fBquickreboot\fP 4 Esta opción hace que live\-boot reinicie sin tratar de expulsar los medios y sin pedirle al usuario que extraiga el dispositivo usado para arrancar. diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 3737585..14be4b7 100644 --- 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 14.02.2013 3.0.1\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 30.11.2012 4.0~a1\-1 "Proyecto Debian Live" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po new file mode 100644 index 0000000..6d3910a --- /dev/null +++ b/manpages/po/de/live-boot.7.po @@ -0,0 +1,911 @@ +# German translations for live-boot package +# Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org> +# This file is distributed under the same license as the live-boot package. +# +msgid "" +msgstr "" +"Project-Id-Version: live-boot 4.0~a1-1\n" +"POT-Creation-Date: 2012-11-30 14:56+0100\n" +"PO-Revision-Date: 2012-04-08 22:48+0300\n" +"Last-Translator: Daniel Baumann <daniel@debian.org>\n" +"Language-Team: none\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ASCII\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "LIVE-BOOT" +msgstr "" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "2012-11-30" +msgstr "30.11.2012" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "4.0~a1-1" +msgstr "" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "Debian Live Project" +msgstr "" + +#. type: SH +#: en/live-boot.7:3 en/persistence.conf.5:3 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:5 +msgid "B<live-boot> - System Boot Scripts" +msgstr "" + +#. type: SH +#: en/live-boot.7:6 en/persistence.conf.5:7 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:8 +msgid "" +"B<live-boot> contains the scripts that configure a Debian Live system during " +"the boot process (early userspace)." +msgstr "" + +#. FIXME +#. type: Plain text +#: en/live-boot.7:11 +msgid "" +"live-boot is a hook for the initramfs-tools, used to generate a initramfs " +"capable to boot live systems, such as those created by I<live-helper>(7). " +"This includes the Debian Live isos, netboot tarballs, and usb stick images." +msgstr "" + +#. FIXME +#. type: Plain text +#: en/live-boot.7:14 +msgid "" +"At boot time it will look for a (read-only) media containing a \"/live\" " +"directory where a root filesystems (often a compressed filesystem image like " +"squashfs) is stored. If found, it will create a writable environment, using " +"aufs, for Debian like systems to boot from." +msgstr "" + +#. type: SH +#: en/live-boot.7:15 +#, no-wrap +msgid "CONFIGURATION" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:17 +msgid "" +"B<live-boot> can be configured through a boot parameter or a configuration " +"file." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:19 +msgid "" +"To configure the live-boot parameters used by default in a live image, see " +"the --bootappend-live option in the I<lb_config>(1) manual page." +msgstr "" + +#. type: SS +#: en/live-boot.7:20 +#, no-wrap +msgid "Kernel Parameters" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:22 +msgid "" +"B<live-boot> is only activated if 'boot=live' was used as a kernel parameter." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:24 +msgid "" +"In addition, there are some more boot parameters to influence the behaviour, " +"see below." +msgstr "" + +#. type: SS +#: en/live-boot.7:25 +#, no-wrap +msgid "Configuration Files" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:27 +msgid "" +"B<live-boot> can be configured (but not activated) through configuration " +"files. Those files can be placed either in the root filesystem itself (/etc/" +"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, " +"live/boot/*)." +msgstr "" + +#. type: SH +#: en/live-boot.7:28 en/persistence.conf.5:57 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. FIXME +#. type: Plain text +#: en/live-boot.7:31 +msgid "B<live-boot> currently features the following parameters." +msgstr "" + +#. type: IP +#: en/live-boot.7:31 +#, no-wrap +msgid "B<access>=I<ACCESS>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:33 +msgid "" +"Set the accessibility level for physically or visually impaired users. " +"ACCESS must be one of v1, v2, v3, m1, or m2. v1=lesser visual impairment, " +"v2=moderate visual impairment, v3=blindness, m1=minor motor difficulties, " +"m2=moderate motor difficulties." +msgstr "" + +#. type: IP +#: en/live-boot.7:33 +#, no-wrap +msgid "B<console>=I<TTY,SPEED>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:35 +msgid "" +"Set the default console to be used with the \"live-getty\" option. Example: " +"\"console=ttyS0,115200\"" +msgstr "" + +#. type: IP +#: en/live-boot.7:35 +#, no-wrap +msgid "B<debug>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:37 +msgid "Makes initramfs boot process more verbose." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:39 +msgid "Use: debug=1" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:41 +msgid "Without setting debug to a value the messages may not be shown." +msgstr "" + +#. type: IP +#: en/live-boot.7:41 +#, no-wrap +msgid "B<fetch>=I<URL>" +msgstr "" + +#. type: IP +#: en/live-boot.7:42 +#, no-wrap +msgid "B<httpfs>=I<URL>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:50 +msgid "" +"Another form of netboot by downloading a squashfs image from a given url. " +"The fetch method copies the image to ram and the httpfs method uses fuse and " +"httpfs2 to mount the image in place. Copying to ram requires more memory and " +"might take a long time for large images. However, it is more likely to work " +"correctly because it does not require networking afterwards and the system " +"operates faster once booted because it does not require to contact the " +"server anymore." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:52 +msgid "" +"Due to current limitations in busybox's wget and DNS resolution, an URL can " +"not contain a hostname but an IP only." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:54 +msgid "Not working: http://example.com/path/to/your_filesystem.squashfs" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:56 +msgid "Working: http://1.2.3.4/path/to/your_filesystem.squashfs" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:58 +msgid "" +"Also note that therefore it's currently not possible to fetch an image from " +"a namebased virtualhost of an httpd if it is sharing the ip with the main " +"httpd instance." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:60 +msgid "You may also use the live iso image in place of the squashfs image." +msgstr "" + +#. type: IP +#: en/live-boot.7:60 +#, no-wrap +msgid "B<iscsi>=I<server-ip[,server-port];target-name>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:62 +msgid "" +"Boot from an iSCSI target that has an iso or disk live image as one of its " +"LUNs. The specified target is searched for a LUN which looks like a live " +"media. If you use the B<iscsitarget> software iSCSI target solution which is " +"packaged in Debian your ietd.conf might look like this:" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:64 +msgid "# The target-name you specify in the iscsi= parameter" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:69 +#, no-wrap +msgid "" +"Target E<lt>target-nameE<gt>\n" +" Lun 0 Path=E<lt>path-to-your-live-image.isoE<gt>,Type=fileio,IOMode=ro\n" +" # If you want to boot multiple machines you might want to look at tuning some parameters like\n" +" # Wthreads or MaxConnections\n" +msgstr "" + +#. type: IP +#: en/live-boot.7:69 +#, no-wrap +msgid "B<findiso>=I</PATH/TO/IMAGE>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:71 +msgid "" +"Look for the specified ISO file on all disks where it usually looks for the ." +"squashfs file (so you don't have to know the device name as in fromiso=....)." +msgstr "" + +#. type: IP +#: en/live-boot.7:71 +#, no-wrap +msgid "B<fromiso>=I</PATH/TO/IMAGE>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:73 +msgid "" +"Allows to use a filesystem from within an iso image that's available on live-" +"media." +msgstr "" + +#. type: IP +#: en/live-boot.7:73 +#, no-wrap +msgid "B<ignore_uuid>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:75 +msgid "" +"Do not check that any UUID embedded in the initramfs matches the discovered " +"medium. live-boot may be told to generate a UUID by setting " +"LIVE_GENERATE_UUID=1 when building the initramfs." +msgstr "" + +#. type: IP +#: en/live-boot.7:75 +#, no-wrap +msgid "B<verify-checksums>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:77 +msgid "" +"If specified, an MD5 sum is calculated on the live media during boot and " +"compared to the value found in md5sum.txt found in the root directory of the " +"live media." +msgstr "" + +#. type: IP +#: en/live-boot.7:77 +#, no-wrap +msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:79 +msgid "" +"Let you specify the name(s) and the options of the interface(s) that should " +"be configured at boot time. Do not specify this if you want to use dhcp " +"(default). It will be changed in a future release to mimick official kernel " +"boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::" +"eth0,:::::eth1:dhcp)." +msgstr "" + +#. type: IP +#: en/live-boot.7:79 +#, no-wrap +msgid "B<ip>=[I<frommedia>]" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:81 +msgid "" +"If this variable is set, dhcp and static configuration are just skipped and " +"the system will use the (must be) media-preconfigured /etc/network/" +"interfaces instead." +msgstr "" + +#. type: IP +#: en/live-boot.7:81 +#, no-wrap +msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:83 +msgid "" +"If you specify one of this two equivalent forms, live-boot will first try to " +"find this device for the \"/live\" directory where the read-only root " +"filesystem should reside. If it did not find something usable, the normal " +"scan for block devices is performed." +msgstr "" + +#. type: Plain text +#: en/live-boot.7:85 +msgid "" +"Instead of specifing an actual device name, the keyword 'removable' can be " +"used to limit the search of acceptable live media to removable type 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 +#: en/live-boot.7:85 +#, no-wrap +msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:87 +msgid "" +"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, " +"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" " +"for loop-aes encryption type." +msgstr "" + +#. type: IP +#: en/live-boot.7:87 +#, no-wrap +msgid "B<live-media-offset>=I<BYTES>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:89 +msgid "" +"This way you could tell live-boot that your image starts at offset BYTES in " +"the above specified or autodiscovered device, this could be useful to hide " +"the Debian Live iso or image inside another iso or image, to create \"clean" +"\" images." +msgstr "" + +#. type: IP +#: en/live-boot.7:89 +#, no-wrap +msgid "B<live-media-path>=I<PATH>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:91 +msgid "" +"Sets the path to the live filesystem on the medium. By default, it is set to " +"'/live' and you should not change that unless you have customized your media " +"accordingly." +msgstr "" + +#. type: IP +#: en/live-boot.7:91 +#, no-wrap +msgid "B<live-media-timeout>=I<SECONDS>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:93 +msgid "" +"Set the timeout in seconds for the device specified by \"live-media=\" to " +"become ready before giving up." +msgstr "" + +#. type: IP +#: en/live-boot.7:93 +#, no-wrap +msgid "B<module>=I<NAME>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:95 +msgid "" +"Instead of using the default optional file \"filesystem.module\" (see below) " +"another file could be specified without the extension \".module\"; it should " +"be placed on \"/live\" directory of the live medium." +msgstr "" + +#. type: IP +#: en/live-boot.7:95 +#, no-wrap +msgid "B<netboot>[=nfs|cifs]" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:97 +msgid "" +"This tells live-boot to perform a network mount. The parameter \"nfsroot=" +"\" (with optional \"nfsopts=\"), should specify where is the location of the " +"root filesystem. With no args, will try cifs first, and if it fails nfs." +msgstr "" + +#. type: IP +#: en/live-boot.7:97 +#, no-wrap +msgid "B<nfsopts>=" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:99 +msgid "This lets you specify custom nfs options." +msgstr "" + +#. type: IP +#: en/live-boot.7:99 +#, no-wrap +msgid "B<nofastboot>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:101 +msgid "" +"This parameter disables the default disabling of filesystem checks in /etc/" +"fstab. If you have static filesystems on your harddisk and you want them to " +"be checked at boot time, use this parameter, otherwise they are skipped." +msgstr "" + +#. type: IP +#: en/live-boot.7:101 +#, no-wrap +msgid "B<nopersistence>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:103 +msgid "" +"disables the \"persistence\" feature, useful if the bootloader (like " +"syslinux) has been installed with persistence enabled." +msgstr "" + +#. type: IP +#: en/live-boot.7:103 +#, no-wrap +msgid "B<noprompt>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:105 +msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot." +msgstr "" + +#. type: IP +#: en/live-boot.7:105 +#, no-wrap +msgid "B<noprompt>=I<TYPE>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:107 +msgid "" +"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or " +"remove the USB flash drive (when noprompt=usb) on reboot." +msgstr "" + +#. type: IP +#: en/live-boot.7:107 +#, no-wrap +msgid "B<ramdisk-size>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:109 +msgid "" +"This parameters allows to set a custom ramdisk size (it's the '-o size' " +"option of tmpfs mount). By default, there is no ramdisk size set, so the " +"default of mount applies (currently 50% of available RAM). Note that this " +"option has no currently no effect when booting with toram." +msgstr "" + +#. type: IP +#: en/live-boot.7:109 +#, no-wrap +msgid "B<swapon>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:111 +msgid "This parameter enables usage of local swap partitions." +msgstr "" + +#. type: IP +#: en/live-boot.7:111 +#, no-wrap +msgid "B<persistence>" +msgstr "" + +#. type: Plain text +#: 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 " +"files (with the correct file name). Overlays are labeled/named \"persistence" +"\" (see I<persistence.conf>(5)). Overlay image files have extensions which " +"determines their filesystem, e.g. \"persistence.ext4\"." +msgstr "" + +#. type: IP +#: en/live-boot.7:113 +#, no-wrap +msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:115 +msgid "" +"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\"." +msgstr "" + +#. type: IP +#: en/live-boot.7:115 +#, no-wrap +msgid "B<persistence-media>={I<removable>|I<removable-usb>}" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:117 +msgid "" +"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." +msgstr "" + +#. type: IP +#: en/live-boot.7:117 +#, no-wrap +msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:119 +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\"). The default is \"overlay\"." +msgstr "" + +#. type: IP +#: en/live-boot.7:119 +#, no-wrap +msgid "B<persistence-path>=I<PATH>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:121 +msgid "" +"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." +msgstr "" + +#. type: IP +#: en/live-boot.7:121 +#, no-wrap +msgid "B<persistence-read-only>" +msgstr "" + +#. type: Plain text +#: 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." +msgstr "" + +#. type: IP +#: en/live-boot.7:123 +#, no-wrap +msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:125 +msgid "" +"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\"." +msgstr "" + +#. type: IP +#: en/live-boot.7:125 +#, no-wrap +msgid "B<persistence-subtext>=I<SUFFIX>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:127 +msgid "" +"Add a suffix when searching for the image filenames or partition labels to " +"use for the above mentioned persistence feature, the SUFFIX will be added " +"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This " +"is handy to test multiple live-boot based live-systems with different " +"persistence storage choices." +msgstr "" + +#. type: IP +#: en/live-boot.7:127 +#, no-wrap +msgid "B<quickreboot>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:129 +msgid "" +"This option causes live-boot to reboot without attempting to eject the media " +"and without asking the user to remove the boot media." +msgstr "" + +#. type: IP +#: en/live-boot.7:129 +#, no-wrap +msgid "B<showmounts>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:131 +msgid "" +"This parameter will make live-boot to show on \"/\" the ro filesystems " +"(mostly compressed) on \"/lib/live\". This is not enabled by default because " +"could lead to problems by applications like \"mono\" which store binary " +"paths on installation." +msgstr "" + +#. type: IP +#: en/live-boot.7:131 +#, no-wrap +msgid "B<silent>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:133 +msgid "" +"If you boot with the normal quiet parameter, live-boot hides most messages " +"of its own. When adding silent, it hides all." +msgstr "" + +#. type: IP +#: en/live-boot.7:133 +#, no-wrap +msgid "B<todisk>=I<DEVICE>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:135 +msgid "" +"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." +msgstr "" + +#. type: IP +#: en/live-boot.7:135 +#, no-wrap +msgid "B<toram>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:137 +msgid "" +"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." +msgstr "" + +#. type: IP +#: en/live-boot.7:137 +#, no-wrap +msgid "B<union>=aufs|unionfs" +msgstr "" + +#. FIXME +#. type: Plain text +#: en/live-boot.7:140 +msgid "" +"By default, live-boot uses aufs. With this parameter, you can switch to " +"unionfs." +msgstr "" + +#. FIXME +#. type: SH +#: en/live-boot.7:142 +#, no-wrap +msgid "FILES (old)" +msgstr "" + +#. type: IP +#: en/live-boot.7:143 +#, no-wrap +msgid "B</etc/live.conf>" +msgstr "" + +#. type: Plain text +#: 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 +#, no-wrap +msgid "B<live/filesystem.module>" +msgstr "" + +#. FIXME +#. type: Plain text +#: 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 \"/" +"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." +msgstr "" + +#. type: SH +#: en/live-boot.7:149 +#, no-wrap +msgid "FILES" +msgstr "" + +#. type: IP +#: en/live-boot.7:150 +#, no-wrap +msgid "B</etc/live/boot.conf>" +msgstr "" + +#. type: IP +#: en/live-boot.7:151 +#, no-wrap +msgid "B</etc/live/boot/*>" +msgstr "" + +#. type: IP +#: en/live-boot.7:152 +#, no-wrap +msgid "B<live/boot.conf>" +msgstr "" + +#. type: IP +#: en/live-boot.7:153 +#, no-wrap +msgid "B<live/boot/*>" +msgstr "" + +#. type: IP +#: en/live-boot.7:154 +#, no-wrap +msgid "B<persistence.conf>" +msgstr "" + +#. type: SH +#: en/live-boot.7:156 en/persistence.conf.5:191 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:158 +msgid "I<persistence.conf>(5)" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:160 en/persistence.conf.5:195 +msgid "I<live-build>(7)" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:162 en/persistence.conf.5:197 +msgid "I<live-config>(7)" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:164 en/persistence.conf.5:199 +msgid "I<live-tools>(7)" +msgstr "" + +#. type: SH +#: en/live-boot.7:165 en/persistence.conf.5:200 +#, no-wrap +msgid "HOMEPAGE" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:167 en/persistence.conf.5:204 +msgid "" +"More information about live-boot and the Debian Live project can be found on " +"the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " +"E<lt>I<http://live.debian.net/manual/>E<gt>." +msgstr "" + +#. type: SH +#: en/live-boot.7:168 en/persistence.conf.5:205 +#, no-wrap +msgid "BUGS" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:170 en/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 E<lt>I<http://bugs.debian.org/>E<gt> or by " +"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists." +"debian.org>E<gt>." +msgstr "" + +#. type: SH +#: en/live-boot.7:171 en/persistence.conf.5:211 +#, no-wrap +msgid "AUTHOR" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:172 +msgid "" +"live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " +"the Debian project." +msgstr "" diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po new file mode 100644 index 0000000..6e4559a --- /dev/null +++ b/manpages/po/de/persistence.conf.5.po @@ -0,0 +1,511 @@ +# German translations for live-boot package +# Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org> +# This file is distributed under the same license as the live-boot package. +# +msgid "" +msgstr "" +"Project-Id-Version: live-boot 4.0~a1-1\n" +"POT-Creation-Date: 2012-11-30 14:56+0100\n" +"PO-Revision-Date: 2012-04-08 22:48+0300\n" +"Last-Translator: Daniel Baumann <daniel@debian.org>\n" +"Language-Team: none\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ASCII\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "LIVE-BOOT" +msgstr "" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "2012-11-30" +msgstr "30.11.2012" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "4.0~a1-1" +msgstr "" + +#. type: TH +#: en/live-boot.7:1 en/persistence.conf.5:1 +#, no-wrap +msgid "Debian Live Project" +msgstr "" + +#. type: SH +#: en/live-boot.7:3 en/persistence.conf.5:3 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: SH +#: en/live-boot.7:6 en/persistence.conf.5:7 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: SH +#: en/live-boot.7:28 en/persistence.conf.5:57 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. type: SH +#: en/live-boot.7:156 en/persistence.conf.5:191 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:160 en/persistence.conf.5:195 +msgid "I<live-build>(7)" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:162 en/persistence.conf.5:197 +msgid "I<live-config>(7)" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:164 en/persistence.conf.5:199 +msgid "I<live-tools>(7)" +msgstr "" + +#. type: SH +#: en/live-boot.7:165 en/persistence.conf.5:200 +#, no-wrap +msgid "HOMEPAGE" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:167 en/persistence.conf.5:204 +msgid "" +"More information about live-boot and the Debian Live project can be found on " +"the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " +"E<lt>I<http://live.debian.net/manual/>E<gt>." +msgstr "" + +#. type: SH +#: en/live-boot.7:168 en/persistence.conf.5:205 +#, no-wrap +msgid "BUGS" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:170 en/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 E<lt>I<http://bugs.debian.org/>E<gt> or by " +"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists." +"debian.org>E<gt>." +msgstr "" + +#. type: SH +#: en/live-boot.7:171 en/persistence.conf.5:211 +#, no-wrap +msgid "AUTHOR" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:6 +msgid "" +"B<persistence.conf> - Configuration file for persistence media in live-boot" +msgstr "" + +#. type: Plain text +#: en/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\") \"persistence\", that " +"volume's persistence is fully customizable through the B<persistence.conf> " +"file stored on the root of its file system. Any such labeled volume must " +"have such a file, or it will be ignored." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:17 +msgid "" +"The format of B<persistence.conf> allows empty lines and lines starting with " +"a \"#\" (used for comments), both which will be ignored. A so called " +"\"custom mount\" has the format:" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:20 +msgid "I<DIR> [I<OPTION>]..." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:24 +msgid "" +"which roughly translates to \"make I<DIR> persistence in the way described " +"by the list of I<OPTION>s\"." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:35 +msgid "" +"For each custom mount I<DIR> 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 I<DIR> on the live file system are stored " +"persistently into a path equivalent to I<DIR> 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<DIR>, but this can " +"be changed through the use of I<OPTION>s." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:48 +msgid "" +"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 I<DIR>:s /a and /a/b " +"it would always be the case that /a is mounted first, then /a/b. This " +"remains true no matter how the lines in B<persistence.conf> are ordered, or " +"if several B<persistence.conf> files on different persistence media are used " +"at the same time. However, it is forbidden for custom mounts to have their " +"source directory inside the source directory of another custom mount, so the " +"source directories that are auto-created by live-boot does not support " +"\"nested\" mounts like /a and /a/b on the same media. In this case you must " +"use the B<source> option (see below) to make sure that they are stored in " +"different source directories." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:56 +msgid "" +"When a source directory doesn't exist on the persistence media for a certain " +"custom mount, it will be created automatically, and permissions and " +"ownership will be optimistically set according to I<DIR>. It will also be " +"bootstrapped by copying the contents of the I<DIR> into its source directory " +"on the persistence media. The bootstrapping will not happen when the B<link> " +"or B<union> options are used (see below)." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:60 +msgid "" +"Custom mounts defined in B<persistence.conf> accept the following options in " +"a coma-separated list:" +msgstr "" + +#. type: IP +#: en/persistence.conf.5:60 +#, no-wrap +msgid "B<source>=I<PATH>" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:69 +msgid "" +"When given, store the persistence changes into I<PATH> on the persistence " +"media. I<PATH> must be a relative path (with respect to the persistence " +"media root) that cannot contain white spaces or the special . or .. path " +"components, with the exception that it can be just . which means the " +"persistence media root. This option is mostly relevant if you want to nest " +"custom mounts, which otherwise would cause errors, or if you want to make " +"the whole media root available (similar to the now deprecated B<home-rw> " +"type of persistence)." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:72 +msgid "" +"The following options are mutually exclusive (only the last given one will " +"be in effect):" +msgstr "" + +#. type: IP +#: en/persistence.conf.5:72 +#, no-wrap +msgid "B<bind>" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:74 +msgid "Bind-mount the source directory to I<DIR>. This is the default." +msgstr "" + +#. type: IP +#: en/persistence.conf.5:74 +#, no-wrap +msgid "B<link>" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:83 +msgid "" +"Create the directory structure of the source directory on the persistence " +"media in I<DIR> and create symbolic links from the corresponding place in " +"I<DIR> to each file in the source directory. Existing files or directories " +"with the same name as any link will be overwritten. Note that deleting the " +"links in I<DIR> will only remove the link, not the corresponding file in the " +"source; removed links will reappear after a reboot. To permanently add or " +"delete a file one must do so directly in the source directory." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:91 +msgid "" +"Effectively B<link> will make only files already in the source directory " +"persistent, not any other files in I<DIR>. These files must be manually " +"added to the source directory to make use of this option, and they will " +"appear in I<DIR> in addition to files already there. This option is useful " +"when only certain files need to be persistent, not the whole directory " +"they're in, e.g. some configuration files in a user's home directory." +msgstr "" + +#. type: IP +#: en/persistence.conf.5:91 +#, no-wrap +msgid "B<union>" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:101 +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 " +"bind-mounts, and will not hide files added to the read-only media. One " +"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>." +msgstr "" + +#. type: SH +#: en/persistence.conf.5:102 +#, no-wrap +msgid "DIRECTORIES" +msgstr "" + +#. type: IP +#: en/persistence.conf.5:103 +#, no-wrap +msgid "B</live/persistence>" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:109 +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 " +"through this mount, as well as any source directories (which is especially " +"practical for custom mounts using the B<link> option)." +msgstr "" + +#. type: SH +#: en/persistence.conf.5:110 +#, no-wrap +msgid "EXAMPLES" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:115 +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 +#, no-wrap +msgid "1." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:118 +msgid "/home/user1 link,source=config-files/user1" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:118 en/persistence.conf.5:133 +#, no-wrap +msgid "2." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:121 +msgid "/home/user2 link,source=config-files/user2" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:121 en/persistence.conf.5:137 +#, no-wrap +msgid "3." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:124 +msgid "/home" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:124 en/persistence.conf.5:140 +#, no-wrap +msgid "4." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:127 +msgid "/usr union" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:129 +msgid "The corresponding source directories are:" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:133 +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 +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 +msgid "I<VOL>/home" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:143 +msgid "I<VOL>/usr" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:146 +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 +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 " +"is simply bind-mounted on /home. To illustrate what happens for lines 1 and " +"2, let's say that the following files exist:" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:151 +#, no-wrap +msgid "a." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:154 +msgid "I<VOL>/config-files/user1/.emacs" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:154 +#, no-wrap +msgid "b." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:157 +msgid "I<VOL>/config-files/user2/.bashrc" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:157 +#, no-wrap +msgid "c." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:160 +msgid "I<VOL>/config-files/user2/.ssh/config" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:162 +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 +#, no-wrap +msgid "Link:" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:165 +msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:168 +msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)" +msgstr "" + +#. type: TP +#: en/persistence.conf.5:168 +#, no-wrap +msgid "Dir:" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:171 +msgid "/homea/user2/.ssh (from c)" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:175 +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 +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 /" +"home persistent. The B<link> option is intended for situations where you " +"don't want a complete directory to be persistent, only certain files in it " +"or its sub-directories." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:190 +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>/" +"usr will be the rw branch due to the B<union> option, and will only contain " +"the difference compared to the underlying read-only file system. Hence " +"packages could be installed into /usr with great space-wise efficiency " +"compared to bind-mounts, since in the latter case all of /usr would have to " +"be copied into I<VOL>/usr during the initial bootstrap." +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:193 +msgid "I<live-boot>(7)" +msgstr "" + +#. type: Plain text +#: en/persistence.conf.5:213 +msgid "" +"persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for " +"the Debian project." +msgstr "" diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 280bd4a..255db5a 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -1,11 +1,11 @@ # Spanish translations for live-boot package -# Copyright (C) 2012-2013 Carlos Zuferri «chals» <chals@altorricon.com> +# Copyright (C) 2012 Carlos Zuferri «chals» <chals@altorricon.com> # This file is distributed under the same license as the live-boot package. # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0.1-1\n" -"POT-Creation-Date: 2013-02-14 19:32+0100\n" +"Project-Id-Version: live-boot 4.0~a1-1\n" +"POT-Creation-Date: 2012-11-30 14:56+0100\n" "PO-Revision-Date: 2012-06-07 20:29+0200\n" "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-14" -msgstr "14.02.2013" +msgid "2012-11-30" +msgstr "30.11.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0.1-1" -msgstr "3.0.1-1" +msgid "4.0~a1-1" +msgstr "4.0~a1-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -406,8 +406,8 @@ msgstr "" #. type: IP #: en/live-boot.7:77 #, no-wrap -msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]" -msgstr "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]" +msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]" +msgstr "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]" #. type: Plain text #: en/live-boot.7:79 @@ -625,22 +625,38 @@ msgstr "" #. type: IP #: en/live-boot.7:103 #, no-wrap -msgid "B<noeject>" -msgstr "B<noeject>" +msgid "B<noprompt>" +msgstr "B<noprompt>" #. type: Plain text #: en/live-boot.7:105 -msgid "Do not prompt to eject the live medium." -msgstr "No pedir que se extraiga el dispositivo en vivo." +msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot." +msgstr "" +"No preguntar para expulsar el CD o extraer la unidad flash USB al reiniciar." #. type: IP #: en/live-boot.7:105 #, no-wrap +msgid "B<noprompt>=I<TYPE>" +msgstr "B<noprompt>=I<TYPE>" + +#. type: Plain text +#: en/live-boot.7:107 +msgid "" +"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or " +"remove the USB flash drive (when noprompt=usb) on reboot." +msgstr "" +"Indica a live-boot que no pregunte para expulsar el CD (usando noprompt=cd) " +"o extraer la unidad flash USB (usando noprompt=usb) al reiniciar." + +#. type: IP +#: en/live-boot.7:107 +#, no-wrap msgid "B<ramdisk-size>" msgstr "B<ramdisk-size>" #. type: Plain text -#: en/live-boot.7:107 +#: en/live-boot.7:109 msgid "" "This parameters allows to set a custom ramdisk size (it's the '-o size' " "option of tmpfs mount). By default, there is no ramdisk size set, so the " @@ -654,24 +670,24 @@ msgstr "" "actualmente ningún efecto cuando se arranca con toram" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:109 #, no-wrap msgid "B<swapon>" msgstr "B<swapon>" #. type: Plain text -#: en/live-boot.7:109 +#: en/live-boot.7:111 msgid "This parameter enables usage of local swap partitions." msgstr "Este parámetro permite el uso de particiones swap locales." #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:111 #, no-wrap msgid "B<persistence>" msgstr "B<persistence>" #. type: Plain text -#: en/live-boot.7:111 +#: 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 " @@ -687,13 +703,13 @@ msgstr "" "sistema de ficheros, por ejemplo, \"persistence.ext4\"." #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:113 #, no-wrap msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" msgstr "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:115 msgid "" "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 " @@ -709,13 +725,13 @@ msgstr "" "contraseña. Por defecto es \"none\"." #. type: IP -#: en/live-boot.7:113 +#: en/live-boot.7:115 #, no-wrap msgid "B<persistence-media>={I<removable>|I<removable-usb>}" msgstr "B<persistence-media>={I<removable>|I<removable-usb>}" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:117 msgid "" "If you specify the keyword 'removable', live-boot will try to find " "persistence partitions on removable media only. Note that if you want to " @@ -728,13 +744,13 @@ msgstr "" "almacenamiento masivo USB se puede utilizar la palabra clave 'removable-usb'" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:117 #, no-wrap msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" msgstr "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:119 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 " @@ -745,13 +761,13 @@ msgstr "" "\"live-rw\" y \"home-rw\"). Por defecto es \"overlay\"." #. type: IP -#: en/live-boot.7:117 +#: en/live-boot.7:119 #, no-wrap msgid "B<persistence-path>=I<PATH>" msgstr "B<persistence-path>=I<PATH>" #. type: Plain text -#: en/live-boot.7:119 +#: en/live-boot.7:121 msgid "" "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 " @@ -763,13 +779,13 @@ msgstr "" "con persistencia." #. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:121 #, no-wrap msgid "B<persistence-read-only>" msgstr "B<persistence-read-only>" #. type: Plain text -#: en/live-boot.7:121 +#: 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." @@ -779,13 +795,13 @@ msgstr "" "montados en sólo lectura." #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:123 #, no-wrap msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" msgstr "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" #. type: Plain text -#: en/live-boot.7:123 +#: en/live-boot.7:125 msgid "" "This option determines which types of persistence storage to consider when " "probing for persistence media. If \"filesystem\" is in the list, filesystems " @@ -801,33 +817,35 @@ msgstr "" "etiquetas correspondientes. Por defecto es \"file,filesystem\". " #. type: IP -#: en/live-boot.7:123 +#: en/live-boot.7:125 #, no-wrap -msgid "B<persistence-label>=I<LABEL>" -msgstr "B<persistence-label>=I<LABEL>" +msgid "B<persistence-subtext>=I<SUFFIX>" +msgstr "B<persistence-subtext>=I<SUFFIX>" #. type: Plain text -#: en/live-boot.7:125 +#: en/live-boot.7:127 msgid "" -"live-boot will use the name \"LABEL\" instead of \"persistence\" when " -"searching for persistent storage. LABEL can be any valid filename, partition " -"label, or GPT name. This option replaces the less flexible persistent-" -"subtext option from version 2 of live-boot. If you wish to continue using " -"legacy names for persistent storage, use the full name with this option, e." -"g. persistence-label=live-rw-foo" +"Add a suffix when searching for the image filenames or partition labels to " +"use for the above mentioned persistence feature, the SUFFIX will be added " +"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This " +"is handy to test multiple live-boot based live-systems with different " +"persistence storage choices." msgstr "" -"live-boot utilizará el nombre \"LABEL\" en lugar de \"persistence\" cuando " -"busque medios de almacenamiento persistente. LABEL puede ser cualquier " -"nombre de fichero, etiqueta de una partición or nombre GPT." +"Añadir un sufijo cuando se buscan los nombres de las imágenes o etiquetas de " +"las particiones a utilizar para la función de la persistencia mencionada " +"anteriormente, el SUFFIX se añadirá después de un guión (por ejemplo: \"live-" +"sn\" se transformaría en \"live-sn-SUFFIX\"). Esto es útil para probar " +"múltiples sistemas en vivo basados en live-boot con diferentes opciones de " +"almacenamiento con persistencia." #. type: IP -#: en/live-boot.7:125 +#: en/live-boot.7:127 #, no-wrap msgid "B<quickreboot>" msgstr "B<quickreboot>" #. type: Plain text -#: en/live-boot.7:127 +#: en/live-boot.7:129 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." @@ -836,13 +854,13 @@ msgstr "" "sin pedirle al usuario que extraiga el dispositivo usado para arrancar." #. type: IP -#: en/live-boot.7:127 +#: en/live-boot.7:129 #, no-wrap msgid "B<showmounts>" msgstr "B<showmounts>" #. type: Plain text -#: en/live-boot.7:129 +#: en/live-boot.7:131 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/lib/live\". This is not enabled by default because " @@ -855,13 +873,13 @@ msgstr "" "que almacenan rutas binarias durante su instalación." #. type: IP -#: en/live-boot.7:129 +#: en/live-boot.7:131 #, no-wrap msgid "B<silent>" msgstr "B<silent>" #. type: Plain text -#: en/live-boot.7:131 +#: en/live-boot.7:133 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." @@ -870,13 +888,13 @@ msgstr "" "sus propios mensajes. Cuando se utiliza silent, los esconde todos." #. type: IP -#: en/live-boot.7:131 +#: en/live-boot.7:133 #, no-wrap msgid "B<todisk>=I<DEVICE>" msgstr "B<todisk>=I<DEVICE>" #. type: Plain text -#: en/live-boot.7:133 +#: en/live-boot.7:135 msgid "" "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 " @@ -892,13 +910,13 @@ msgstr "" "utilizado esta vez." #. type: IP -#: en/live-boot.7:133 +#: en/live-boot.7:135 #, no-wrap msgid "B<toram>" msgstr "B<toram>" #. type: Plain text -#: en/live-boot.7:135 +#: en/live-boot.7:137 msgid "" "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 " @@ -910,14 +928,14 @@ msgstr "" "espacio utilizado por los medios de sólo lectura." #. type: IP -#: en/live-boot.7:135 +#: en/live-boot.7:137 #, no-wrap msgid "B<union>=aufs|unionfs" msgstr "B<union>=aufs|unionfs" #. FIXME #. type: Plain text -#: en/live-boot.7:138 +#: en/live-boot.7:140 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." @@ -927,19 +945,19 @@ msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:140 +#: en/live-boot.7:142 #, no-wrap msgid "FILES (old)" msgstr "FICHEROS (antiguos)" #. type: IP -#: en/live-boot.7:141 +#: en/live-boot.7:143 #, no-wrap msgid "B</etc/live.conf>" msgstr "B</etc/live.conf>" #. type: Plain text -#: en/live-boot.7:143 +#: en/live-boot.7:145 msgid "" "Some variables can be configured via this config file (inside the live " "system)." @@ -948,14 +966,14 @@ msgstr "" "configuración (dentro del sistema en vivo)." #. type: IP -#: en/live-boot.7:143 +#: en/live-boot.7:145 #, no-wrap msgid "B<live/filesystem.module>" msgstr "B<live/filesystem.module>" #. FIXME #. type: Plain text -#: en/live-boot.7:146 +#: 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 \"/" @@ -977,75 +995,75 @@ msgstr "" "cargan en orden alfanumérico." #. type: SH -#: en/live-boot.7:147 +#: en/live-boot.7:149 #, no-wrap msgid "FILES" msgstr "FICHEROS" #. type: IP -#: en/live-boot.7:148 +#: en/live-boot.7:150 #, no-wrap msgid "B</etc/live/boot.conf>" msgstr "B</etc/live/boot.conf>" #. type: IP -#: en/live-boot.7:149 +#: en/live-boot.7:151 #, no-wrap msgid "B</etc/live/boot/*>" msgstr "B</etc/live/boot/*>" #. type: IP -#: en/live-boot.7:150 +#: en/live-boot.7:152 #, no-wrap msgid "B<live/boot.conf>" msgstr "B<live/boot.conf>" #. type: IP -#: en/live-boot.7:151 +#: en/live-boot.7:153 #, no-wrap msgid "B<live/boot/*>" msgstr "B<live/boot.d/*>" #. type: IP -#: en/live-boot.7:152 +#: en/live-boot.7:154 #, no-wrap msgid "B<persistence.conf>" msgstr "B<persistence.conf>" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "VER ADEMÁS" #. type: Plain text -#: en/live-boot.7:156 +#: en/live-boot.7:158 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:160 en/persistence.conf.5:195 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:162 en/persistence.conf.5:197 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:164 en/persistence.conf.5:199 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:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "PÁGINA WEB" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -1056,13 +1074,13 @@ msgstr "" "E<lt>I<http://live.debian.net/manual/>E<gt>." #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "ERRORES" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:210 +#: en/live-boot.7:170 en/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 E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -1075,13 +1093,13 @@ msgstr "" "Live 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:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:170 +#: en/live-boot.7:172 msgid "" "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 9e7db9b..349849a 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -1,11 +1,11 @@ # Spanish translations for live-boot package -# Copyright (C) 2012-2013 Carlos Zuferri «chals» <chals@altorricon.com> +# Copyright (C) 2012 Carlos Zuferri «chals» <chals@altorricon.com> # This file is distributed under the same license as the live-boot package. # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0.1-1\n" -"POT-Creation-Date: 2013-02-14 19:32+0100\n" +"Project-Id-Version: live-boot 4.0~a1-1\n" +"POT-Creation-Date: 2012-11-30 14:56+0100\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n" "Language-Team: none\n" @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-14" -msgstr "14.02.2013" +msgid "2012-11-30" +msgstr "30.11.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0.1-1" -msgstr "3.0.1-1" +msgid "4.0~a1-1" +msgstr "4.0~a1-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -57,34 +57,34 @@ msgid "OPTIONS" msgstr "OPCIONES" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, 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:160 en/persistence.conf.5:195 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:162 en/persistence.conf.5:197 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:164 en/persistence.conf.5:199 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:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "PÁGINA WEB" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -95,13 +95,13 @@ msgstr "" "E<lt>I<http://live.debian.net/manual/>E<gt>." #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "ERRORES" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:210 +#: en/live-boot.7:170 en/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 E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -114,7 +114,7 @@ msgstr "" "Live 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:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" diff --git a/manpages/po4a.cfg b/manpages/po4a.cfg index 3e6270f..baa1fa9 100644 --- a/manpages/po4a.cfg +++ b/manpages/po4a.cfg @@ -1,4 +1,4 @@ -[po4a_langs] es +[po4a_langs] de es [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po [type: man] en/live-boot.7 $lang:$lang/live-boot.$lang.7 [type: man] en/persistence.conf.5 $lang:$lang/persistence.conf.$lang.5 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 1dd433c..2b94356 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-02-14 19:32+0100\n" +"POT-Creation-Date: 2012-11-30 14:56+0100\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 "2013-02-14" +msgid "2012-11-30" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0.1-1" +msgid "4.0~a1-1" msgstr "" #. type: TH @@ -339,7 +339,7 @@ msgstr "" #. type: IP #: en/live-boot.7:77 #, no-wrap -msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]" +msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]" msgstr "" #. type: Plain text @@ -515,23 +515,36 @@ msgstr "" #. type: IP #: en/live-boot.7:103 #, no-wrap -msgid "B<noeject>" +msgid "B<noprompt>" msgstr "" #. type: Plain text #: en/live-boot.7:105 -msgid "Do not prompt to eject the live medium." +msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot." msgstr "" #. type: IP #: en/live-boot.7:105 #, no-wrap -msgid "B<ramdisk-size>" +msgid "B<noprompt>=I<TYPE>" msgstr "" #. type: Plain text #: en/live-boot.7:107 msgid "" +"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or " +"remove the USB flash drive (when noprompt=usb) on reboot." +msgstr "" + +#. type: IP +#: en/live-boot.7:107 +#, no-wrap +msgid "B<ramdisk-size>" +msgstr "" + +#. type: Plain text +#: en/live-boot.7:109 +msgid "" "This parameters allows to set a custom ramdisk size (it's the '-o size' " "option of tmpfs mount). By default, there is no ramdisk size set, so the " "default of mount applies (currently 50% of available RAM). Note that this " @@ -539,24 +552,24 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:109 #, no-wrap msgid "B<swapon>" msgstr "" #. type: Plain text -#: en/live-boot.7:109 +#: en/live-boot.7:111 msgid "This parameter enables usage of local swap partitions." msgstr "" #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:111 #, no-wrap msgid "B<persistence>" msgstr "" #. type: Plain text -#: en/live-boot.7:111 +#: 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 " @@ -566,13 +579,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:113 #, no-wrap msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" msgstr "" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:115 msgid "" "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 " @@ -582,13 +595,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:113 +#: en/live-boot.7:115 #, no-wrap msgid "B<persistence-media>={I<removable>|I<removable-usb>}" msgstr "" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:117 msgid "" "If you specify the keyword 'removable', live-boot will try to find " "persistence partitions on removable media only. Note that if you want to " @@ -597,13 +610,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:117 #, no-wrap msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" msgstr "" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:119 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 " @@ -611,13 +624,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:117 +#: en/live-boot.7:119 #, no-wrap msgid "B<persistence-path>=I<PATH>" msgstr "" #. type: Plain text -#: en/live-boot.7:119 +#: en/live-boot.7:121 msgid "" "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 " @@ -625,26 +638,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:121 #, no-wrap msgid "B<persistence-read-only>" msgstr "" #. type: Plain text -#: en/live-boot.7:121 +#: 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." msgstr "" #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:123 #, no-wrap msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>" msgstr "" #. type: Plain text -#: en/live-boot.7:123 +#: en/live-boot.7:125 msgid "" "This option determines which types of persistence storage to consider when " "probing for persistence media. If \"filesystem\" is in the list, filesystems " @@ -654,43 +667,42 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:123 +#: en/live-boot.7:125 #, no-wrap -msgid "B<persistence-label>=I<LABEL>" +msgid "B<persistence-subtext>=I<SUFFIX>" msgstr "" #. type: Plain text -#: en/live-boot.7:125 +#: en/live-boot.7:127 msgid "" -"live-boot will use the name \"LABEL\" instead of \"persistence\" when " -"searching for persistent storage. LABEL can be any valid filename, partition " -"label, or GPT name. This option replaces the less flexible persistent-" -"subtext option from version 2 of live-boot. If you wish to continue using " -"legacy names for persistent storage, use the full name with this option, e." -"g. persistence-label=live-rw-foo" +"Add a suffix when searching for the image filenames or partition labels to " +"use for the above mentioned persistence feature, the SUFFIX will be added " +"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This " +"is handy to test multiple live-boot based live-systems with different " +"persistence storage choices." msgstr "" #. type: IP -#: en/live-boot.7:125 +#: en/live-boot.7:127 #, no-wrap msgid "B<quickreboot>" msgstr "" #. type: Plain text -#: en/live-boot.7:127 +#: en/live-boot.7:129 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." msgstr "" #. type: IP -#: en/live-boot.7:127 +#: en/live-boot.7:129 #, no-wrap msgid "B<showmounts>" msgstr "" #. type: Plain text -#: en/live-boot.7:129 +#: en/live-boot.7:131 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/lib/live\". This is not enabled by default because " @@ -699,26 +711,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:129 +#: en/live-boot.7:131 #, no-wrap msgid "B<silent>" msgstr "" #. type: Plain text -#: en/live-boot.7:131 +#: en/live-boot.7:133 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." msgstr "" #. type: IP -#: en/live-boot.7:131 +#: en/live-boot.7:133 #, no-wrap msgid "B<todisk>=I<DEVICE>" msgstr "" #. type: Plain text -#: en/live-boot.7:133 +#: en/live-boot.7:135 msgid "" "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 " @@ -728,13 +740,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:133 +#: en/live-boot.7:135 #, no-wrap msgid "B<toram>" msgstr "" #. type: Plain text -#: en/live-boot.7:135 +#: en/live-boot.7:137 msgid "" "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 " @@ -742,14 +754,14 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:135 +#: en/live-boot.7:137 #, no-wrap msgid "B<union>=aufs|unionfs" msgstr "" #. FIXME #. type: Plain text -#: en/live-boot.7:138 +#: en/live-boot.7:140 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." @@ -757,33 +769,33 @@ msgstr "" #. FIXME #. type: SH -#: en/live-boot.7:140 +#: en/live-boot.7:142 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:141 +#: en/live-boot.7:143 #, no-wrap msgid "B</etc/live.conf>" msgstr "" #. type: Plain text -#: en/live-boot.7:143 +#: 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:143 +#: en/live-boot.7:145 #, no-wrap msgid "B<live/filesystem.module>" msgstr "" #. FIXME #. type: Plain text -#: en/live-boot.7:146 +#: 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 \"/" @@ -796,75 +808,75 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:147 +#: en/live-boot.7:149 #, no-wrap msgid "FILES" msgstr "" #. type: IP -#: en/live-boot.7:148 +#: en/live-boot.7:150 #, no-wrap msgid "B</etc/live/boot.conf>" msgstr "" #. type: IP -#: en/live-boot.7:149 +#: en/live-boot.7:151 #, no-wrap msgid "B</etc/live/boot/*>" msgstr "" #. type: IP -#: en/live-boot.7:150 +#: en/live-boot.7:152 #, no-wrap msgid "B<live/boot.conf>" msgstr "" #. type: IP -#: en/live-boot.7:151 +#: en/live-boot.7:153 #, no-wrap msgid "B<live/boot/*>" msgstr "" #. type: IP -#: en/live-boot.7:152 +#: en/live-boot.7:154 #, no-wrap msgid "B<persistence.conf>" msgstr "" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:156 +#: en/live-boot.7:158 msgid "I<persistence.conf>(5)" msgstr "" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -872,13 +884,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:210 +#: en/live-boot.7:170 en/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 E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -887,13 +899,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:170 +#: en/live-boot.7:172 msgid "" "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 177f9d5..2751003 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-02-14 19:32+0100\n" +"POT-Creation-Date: 2012-11-30 14:56+0100\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 "2013-02-14" +msgid "2012-11-30" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0.1-1" +msgid "4.0~a1-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:156 en/persistence.conf.5:191 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:160 en/persistence.conf.5:195 msgid "I<live-build>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:162 en/persistence.conf.5:197 msgid "I<live-config>(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:164 en/persistence.conf.5:199 msgid "I<live-tools>(7)" msgstr "" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:165 en/persistence.conf.5:200 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:204 +#: en/live-boot.7:167 en/persistence.conf.5:204 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -94,13 +94,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:205 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:210 +#: en/live-boot.7:170 en/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 E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -109,7 +109,7 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:211 +#: en/live-boot.7:171 en/persistence.conf.5:211 #, no-wrap msgid "AUTHOR" msgstr "" diff --git a/scripts/boot/3010-verify-checksums b/scripts/boot/3010-verify-checksums index 08b2972..8ccd663 100755 --- a/scripts/boot/3010-verify-checksums +++ b/scripts/boot/3010-verify-checksums @@ -38,29 +38,26 @@ Verify_checksums () for _DIGEST in $(echo ${LIVE_VERIFY_CHECKSUMS_DIGESTS} | sed -e 's|,| |g') do - _CHECKSUMS="$(echo ${_DIGEST} | tr [a-z] [A-Z])SUMS ${_DIGEST}sum.txt" + _CHECKSUMS="$(echo ${_DIGEST} | tr [a-z] [A-Z])SUMS" - for _CHECKSUM in ${_CHECKSUMS} - do - if [ -e "${_CHECKSUM}" ] - then - echo "Found ${_CHECKSUM}..." > "${_TTY}" + if [ -e "${_CHECKSUMS}" ] + then + echo "Found ${_CHECKSUMS}..." > "${_TTY}" - if [ -e "/bin/${_DIGEST}sum" ] - then - echo "Checking ${_CHECKSUM}..." > "${_TTY}" + if [ -e "/bin/${_DIGEST}sum" ] + then + echo "Checking ${_CHECKSUMS}..." > "${_TTY}" - # Verify checksums - /bin/${_DIGEST}sum -c "${_CHECKSUM}" < "${_TTY}" > "${_TTY}" - _RETURN="${?}" + # Verify checksums + /bin/${_DIGEST}sum -c "${_CHECKSUMS}" < "${_TTY}" > "${_TTY}" + _RETURN="${?}" - # Stop after first verification - break - else - echo "Not found /bin/${_DIGEST}sum..." > "${_TTY}" - fi + # Stop after first verification + break + else + echo "Not found /bin/${_DIGEST}sum..." > "${_TTY}" fi - done + fi done log_end_msg diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon index e7aed6c..3df90de 100755 --- a/scripts/boot/3020-swapon +++ b/scripts/boot/3020-swapon @@ -29,15 +29,6 @@ Swap () LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}" - if [ -e /root/etc/fstab.d ] - then - # wheezy - _FSTAB="/root/etc/fstab.d/swap" - else - # squeeze - _FSTAB="/root/etc/fstab" - fi - for _DEVICE in $(echo ${LIVE_SWAP_DEVICES} | sed -e 's|,| |g') do if [ ! -b "${_DEVICE}" ] @@ -57,15 +48,15 @@ Swap () done # Remove all auto swap entries - if grep -qs "swap swap" "${_FSTAB}" + if grep -qs "swap swap" /root/etc/fstab.d/swap then - grep -v "swap swap" "${_FSTAB}" > "${_FSTAB}".tmp - mv "${_FSTAB}".tmp "${_FSTAB}" + grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp + mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap fi # Add new swap entries for _DEVICE in ${_SWAP_DEVICES} do - echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}" + echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab.d/swap done } diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh index a1eb14a..416d6b4 100755 --- a/scripts/boot/9990-aaa-fixme.sh +++ b/scripts/boot/9990-aaa-fixme.sh @@ -40,8 +40,6 @@ else udevinfo='udevinfo' fi -old_root_overlay_label="live-rw" -old_home_overlay_label="home-rw" custom_overlay_label="persistence" persistence_list="persistence.conf" old_persistence_list="live-persistence.conf" diff --git a/scripts/boot/9990-fstab.sh b/scripts/boot/9990-fstab.sh index abc7b23..5ae9546 100755 --- a/scripts/boot/9990-fstab.sh +++ b/scripts/boot/9990-fstab.sh @@ -13,25 +13,16 @@ Fstab () return fi - if [ -e /root/etc/fstab.d ] - then - # wheezy - _FSTAB="/root/etc/fstab.d/live" - else - # squeeze - _FSTAB="/root/etc/fstab" - fi - log_begin_msg "Configuring fstab" - if ! grep -qs "^${UNIONTYPE}" "${_FSTAB}" + if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab.d/live then - echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${_FSTAB}" + echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live fi - if ! grep -qs "^tmpfs /tmp" "${_FSTAB}" + if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live then - echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${_FSTAB}" + echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live fi log_end_msg diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index fd10e5d..983a1cb 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -32,12 +32,6 @@ Main () . /conf/param.conf fi - if [ -n "${FUSE_MOUNT}" ] - then - # fuse does not work with klibc mount - ln -f /bin/mount.util-linux /bin/mount - fi - # Needed here too because some things (*cough* udev *cough*) # changes the timeout @@ -135,19 +129,6 @@ Main () mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}" fi - # At this point /root should contain the final root filesystem. - # Move all mountpoints below /live into /root/lib/live/mount. - # This has to be done after mounting the root filesystem to / - # otherwise these mount points won't be accessible from the running system. - for _MOUNT in $(cat /proc/mounts | cut -f 2 -d " " | grep -e "^/live/") - do - local newmount - newmount="${rootmnt}/lib/live/mount/${_MOUNT#/live/}" - mkdir -p "${newmount}" - mount -o move "${_MOUNT}" "${newmount}" > /dev/null 2>&1 || \ - mount -o bind "${_MOUNT}" "${newmount}" > /dev/null || \ - log_warning_msg "W: failed to move or bindmount ${_MOUNT} to ${newmount}" - done if [ -n "${ROOT_PID}" ] then @@ -164,6 +145,9 @@ Main () ;; esac + # Move to the new root filesystem so that programs there can get at it. + mkdir -p /root/lib/live/mount/medium + mount --move /live/medium /root/lib/live/mount/medium # aufs2 in kernel versions around 2.6.33 has a regression: # directories can't be accessed when read for the first the time, @@ -171,6 +155,13 @@ Main () # when booting FAI, this simple workaround solves it ls /root/* >/dev/null 2>&1 + # Move findiso directory to the new root filesystem so that programs there can get at it. + if [ -d /live/findiso ] + then + mkdir -p /root/lib/live/mount/findiso + mount -n --move /live/findiso /root/lib/live/mount/findiso + fi + # if we do not unmount the ISO we can't run "fsck /dev/ice" later on # because the mountpoint is left behind in /proc/mounts, so let's get # rid of it when running from RAM diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 2509c90..358448b 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -65,8 +65,7 @@ get_backing_device () match_files_in_dir () { # Does any files match pattern ${1} ? - local pattern - pattern="${1}" + local pattern="${1}" if [ "$(echo ${pattern})" != "${pattern}" ] then @@ -100,16 +99,7 @@ is_nice_device () { sysfs_path="${1#/sys}" - if [ -e /lib/udev/path_id ] - then - # squeeze - PATH_ID="/lib/udev/path_id" - else - # wheezy/sid (udev >= 174) - PATH_ID="/sbin/udevadm test-builtin path_id" - fi - - if ${PATH_ID} "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)" + if /sbin/udevadm test-builtin path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)" then return 0 elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' @@ -379,27 +369,24 @@ really_export () is_in_list_separator_helper () { - local sep element list - sep=${1} + local sep=${1} shift - element=${1} + local element=${1} shift - list=${*} + local list=${*} echo ${list} | grep -qe "^\(.*${sep}\)\?${element}\(${sep}.*\)\?$" } is_in_space_sep_list () { - local element - element=${1} + local element=${1} shift is_in_list_separator_helper "[[:space:]]" "${element}" "${*}" } is_in_comma_sep_list () { - local element - element=${1} + local element=${1} shift is_in_list_separator_helper "," "${element}" "${*}" } @@ -516,28 +503,25 @@ trim_path () what_is_mounted_on () { - local dir - dir="$(trim_path ${1})" + local dir="$(trim_path ${1})" grep -m1 "^[^ ]\+ ${dir} " /proc/mounts | cut -d' ' -f1 } chown_ref () { - local reference targets owner - reference="${1}" + local reference="${1}" shift - targets=${@} - owner=$(stat -c %u:%g "${reference}") + local targets=${@} + local owner=$(stat -c %u:%g "${reference}") chown -h ${owner} ${targets} } chmod_ref () { - local reference targets rights - reference="${1}" + local reference="${1}" shift - targets=${@} - rights=$(stat -c %a "${reference}") + local targets=${@} + local rights=$(stat -c %a "${reference}") chmod ${rights} ${targets} } @@ -600,7 +584,7 @@ fs_size () size=$(expr ${size} + ${size} / 20 ) # FIXME: 5% more to be sure else # free space - size="$(df -kP | grep -s ${mountp} | awk '{print $4}')" + size="$(df -k | grep -s ${mountp} | awk '{print $4}')" fi if [ -n "${doumount}" ] @@ -623,13 +607,12 @@ load_keymap () setup_loop () { - local fspath module pattern offset encryption readonly - fspath=${1} - module=${2} - pattern=${3} - offset=${4} - encryption=${5} - readonly=${6} + local fspath=${1} + local module=${2} + local pattern=${3} + local offset=${4} + local encryption=${5} + local readonly=${6} # the output of setup_loop is evaluated in other functions, # modprobe leaks kernel options like "libata.dma=0" @@ -731,25 +714,19 @@ try_mount () fi } -# Try to mount $device to the place expected by live-boot. If $device -# is already mounted somewhere, move it to the expected place. If -# we're only probing $device (to check if it has custom persistence) -# $probe should be set, which suppresses warnings upon failure. On -# success, print the mount point for $device. mount_persistence_media () { - local device probe backing old_backing fstype mount_opts - device=${1} - probe=${2} + local device=${1} + local probe=${2} - backing="/live/persistence/$(basename ${device})" + local backing="/live/persistence/$(basename ${device})" mkdir -p "${backing}" - old_backing="$(where_is_mounted ${device})" + local old_backing="$(where_is_mounted ${device})" if [ -z "${old_backing}" ] then - fstype="$(get_fstype ${device})" - mount_opts="rw,noatime" + local fstype="$(get_fstype ${device})" + local mount_opts="rw,noatime" if [ -n "${PERSISTENCE_READONLY}" ] then mount_opts="ro,noatime" @@ -774,19 +751,14 @@ mount_persistence_media () rmdir "${backing}" return 1 fi - else - # This means that $device has already been mounted on - # the place expected by live-boot, so we're done. - echo ${backing} - return 0 fi + return 0 } close_persistence_media () { - local device backing - device=${1} - backing="$(where_is_mounted ${device})" + local device=${1} + local backing="$(where_is_mounted ${device})" if [ -d "${backing}" ] then @@ -852,25 +824,22 @@ open_luks_device () get_gpt_name () { - local dev - dev="${1}" + local dev="${1}" /sbin/blkid -s PART_ENTRY_NAME -p -o value ${dev} 2>/dev/null } is_gpt_device () { - local dev - dev="${1}" + local dev="${1}" [ "$(/sbin/blkid -s PART_ENTRY_SCHEME -p -o value ${dev} 2>/dev/null)" = "gpt" ] } probe_for_gpt_name () { - local overlays dev gpt_dev gpt_name - overlays="${1}" - dev="${2}" + local overlays="${1}" + local dev="${2}" - gpt_dev="${dev}" + local gpt_dev="${dev}" if is_active_luks_mapping ${dev} then # if $dev is an opened luks device, we need to check @@ -883,7 +852,7 @@ probe_for_gpt_name () return fi - gpt_name=$(get_gpt_name ${gpt_dev}) + local gpt_name=$(get_gpt_name ${gpt_dev}) for label in ${overlays} do if [ "${gpt_name}" = "${label}" ] @@ -895,9 +864,8 @@ probe_for_gpt_name () probe_for_fs_label () { - local overlays dev - overlays="${1}" - dev="${2}" + local overlays="${1}" + local dev="${2}" for label in ${overlays} do @@ -910,12 +878,11 @@ probe_for_fs_label () probe_for_file_name () { - local overlays dev ret backing - overlays="${1}" - dev="${2}" + local overlays="${1}" + local dev="${2}" - ret="" - backing="$(mount_persistence_media ${dev} probe)" + local ret="" + local backing="$(mount_persistence_media ${dev} probe)" if [ -z "${backing}" ] then return @@ -926,8 +893,7 @@ probe_for_file_name () path=${backing}/${PERSISTENCE_PATH}${label} if [ -f "${path}" ] then - local loopdev - loopdev=$(setup_loop "${path}" "loop" "/sys/block/loop*") + local loopdev=$(setup_loop "${path}" "loop" "/sys/block/loop*") ret="${ret} ${label}=${loopdev}" fi done @@ -961,19 +927,17 @@ find_persistence_media () # ${white_list_devices} is non-empty, only devices in it will be # scanned. - local overlays white_listed_devices ret black_listed_devices - overlays="${1}" - white_listed_devices="${2}" - ret="" + local overlays="${1}" + local white_listed_devices="${2}" + local ret="" - black_listed_devices="$(what_is_mounted_on /live/medium)" + local black_listed_devices="$(what_is_mounted_on /live/medium)" for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") do - local result luks_device - result="" + local result="" - luks_device="" + local luks_device="" # Check if it's a luks device; we'll have to open the device # in order to probe any filesystem it contains, like we do # below. activate_custom_mounts() also depends on that any luks @@ -1149,12 +1113,11 @@ link_files () # is non-empty, remove mask from all source paths when # creating links (will be necessary if we change root, which # live-boot normally does (into $rootmnt)). - local src_dir dest_dir src_mask # remove multiple /:s and ensure ending on / - src_dir="$(trim_path ${1})/" - dest_dir="$(trim_path ${2})/" - src_mask="${3}" + local src_dir="$(trim_path ${1})/" + local dest_dir="$(trim_path ${2})/" + local src_mask="${3}" # This check can only trigger on the inital, non-recursive call since # we create the destination before recursive calls @@ -1167,8 +1130,7 @@ link_files () find "${src_dir}" -mindepth 1 -maxdepth 1 | \ while read src do - local dest final_src - dest="${dest_dir}$(basename "${src}")" + local dest="${dest_dir}$(basename "${src}")" if [ -d "${src}" ] then if [ -z "$(ls -A "${src}")" ] @@ -1183,7 +1145,7 @@ link_files () fi link_files "${src}" "${dest}" "${src_mask}" else - final_src=${src} + local final_src=${src} if [ -n "${src_mask}" ] then final_src="$(echo ${final_src} | sed "s|^${src_mask}||")" @@ -1197,12 +1159,10 @@ link_files () do_union () { - local unionmountpoint unionrw unionro - unionmountpoint="${1}" # directory where the union is mounted - shift - unionrw="${1}" # branch where the union changes are stored - shift - unionro="${*}" # space separated list of read-only branches (optional) + local unionmountpoint="${1}" # directory where the union is mounted + local unionrw="${2}" # branch where the union changes are stored + local unionro1="${3}" # first underlying read-only branch (optional) + local unionro2="${4}" # second underlying read-only branch (optional) case "${UNIONTYPE}" in aufs) @@ -1226,12 +1186,13 @@ do_union () unionfs-fuse) unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid" unionmountopts="${unionmountopts} ${unionrw}=${rw_opt}" - if [ -n "${unionro}" ] + if [ -n "${unionro1}" ] then - for rofs in ${unionro} - do - unionmountopts="${unionmountopts}:${rofs}=${ro_opt}" - done + unionmountopts="${unionmountopts}:${unionro1}=${ro_opt}" + fi + if [ -n "${unionro2}" ] + then + unionmountopts="${unionmountopts}:${unionro2}=${ro_opt}" fi ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384 unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \ @@ -1240,27 +1201,21 @@ do_union () ;; 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? - if echo ${unionro} | grep -q " " - then - panic "Multiple lower filesystems are currently not supported with overlayfs (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}" + # XXX: can unionro2 be used? (overlayfs only handles two dirs, but perhaps they can be chained?) + # XXX: and can unionro1 be optional? i.e. can overlayfs skip lowerdir? + unionmountopts="-o noatime,lowerdir=${unionro1},upperdir=${unionrw}" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; *) unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}" - if [ -n "${unionro}" ] + if [ -n "${unionro1}" ] then - for rofs in ${unionro} - do - unionmountopts="${unionmountopts}:${rofs}=${ro_opt}" - done + unionmountopts="${unionmountopts}:${unionro1}=${ro_opt}" + fi + if [ -n "${unionro2}" ] + then + unionmountopts="${unionmountopts}:${unionro2}=${ro_opt}" fi mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; @@ -1272,13 +1227,12 @@ get_custom_mounts () # Side-effect: leaves $devices with persistence.conf mounted in /live/persistence # Side-effect: prints info to file $custom_mounts - local custom_mounts devices bindings links - custom_mounts=${1} + local custom_mounts=${1} shift - devices=${@} + local devices=${@} - bindings="/tmp/bindings.list" - links="/tmp/links.list" + local bindings="/tmp/bindings.list" + local links="/tmp/links.list" rm -rf ${bindings} ${links} 2> /dev/null for device in ${devices} @@ -1288,14 +1242,14 @@ get_custom_mounts () continue fi - local device_name backing include_list - device_name="$(basename ${device})" - backing=$(mount_persistence_media ${device}) + local device_name="$(basename ${device})" + local backing=$(mount_persistence_media ${device}) if [ -z "${backing}" ] then continue fi + local include_list if [ -r "${backing}/${persistence_list}" ] then include_list="${backing}/${persistence_list}" @@ -1319,15 +1273,14 @@ get_custom_mounts () continue fi - if trim_path ${dir} | grep -q -e "^[^/]" -e "^/lib" -e "^/lib/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$" + if trim_path ${dir} | grep -q -e "^[^/]" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$" then - log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/lib\", or \"/lib/live\" or any of its sub-directories." + log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/live\" or any sub-directory therein." continue fi - local opt_source opt_link source full_source full_dest - opt_source="" - opt_link="" + local opt_source="" + local opt_link="" for opt in $(echo ${options} | tr ',' ' '); do case "${opt}" in @@ -1346,7 +1299,7 @@ get_custom_mounts () esac done - source="${dir}" + local source="${dir}" if [ -n "${opt_source}" ] then if echo ${opt_source} | grep -q -e "^/" -e "^\(.*/\)\?\.\.\?\(/.*\)\?$" && [ "${opt_source}" != "." ] @@ -1358,8 +1311,8 @@ get_custom_mounts () fi fi - full_source="$(trim_path ${backing}/${source})" - full_dest="$(trim_path ${rootmnt}/${dir})" + local full_source="$(trim_path ${backing}/${source})" + local full_dest="$(trim_path ${rootmnt}/${dir})" if [ -n "${opt_link}" ] then echo "${device} ${full_source} ${full_dest} ${options}" >> ${links} @@ -1380,9 +1333,8 @@ get_custom_mounts () # We need to make sure that no two custom mounts have the same sources # or are nested; if that is the case, too much weird stuff can happen. - local prev_source prev_dest - prev_source="impossible source" # first iteration must not match - prev_dest="" + local prev_source="impossible source" # first iteration must not match + local prev_dest="" # This sort will ensure that a source /a comes right before a source # /a/b so we only need to look at the previous source sort -k2 -b ${custom_mounts} | @@ -1399,16 +1351,14 @@ get_custom_mounts () activate_custom_mounts () { - local custom_mounts used_devices - custom_mounts="${1}" # the ouput from get_custom_mounts() - used_devices="" + local custom_mounts="${1}" # the ouput from get_custom_mounts() + local used_devices="" while read device source dest options # < ${custom_mounts} do - local opt_bind opt_link opt_union - opt_bind="true" - opt_link="" - opt_union="" + local opt_bind="true" + local opt_link="" + local opt_union="" for opt in $(echo ${options} | tr ',' ' '); do case "${opt}" in @@ -1489,33 +1439,33 @@ activate_custom_mounts () # XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can # ignore the loop below and set rootfs_dest_backing=$dest - local rootfs_dest_backing - rootfs_dest_backing="" + local rootfs_dest_backing="" if [ -n "${opt_link}"] then for d in /live/rootfs/* do if [ -n "${rootmnt}" ] then - fs="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")" + rootfs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")" else - fs="${d}/${dest}" + rootfs_dest_backing="${d}/${dest}" fi - if [ -d "${fs}" ] + if [ -d "${rootfs_dest_backing}" ] then - rootfs_dest_backing="${rootfs_dest_backing} ${fs}" + break + else + rootfs_dest_backing="" fi done fi - local cow_dir links_source if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ] then link_files ${source} ${dest} ${rootmnt} elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ] then - mkdir -p ${rootmnt}/lib/live/mount/persistence - links_source=$(mktemp -d ${rootmnt}/lib/live/mount/persistence/links-source-XXXXXX) + mkdir -p /live/persistence + local links_source=$(mktemp -d /live/persistence/links-source-XXXXXX) chown_ref ${source} ${links_source} chmod_ref ${source} ${links_source} # We put the cow dir in the below strange place to @@ -1523,7 +1473,7 @@ activate_custom_mounts () # has its own directory and isn't nested with some # other custom mount (if so that mount's files would # be linked, causing breakage. - cow_dir="/live/overlay/lib/live/mount/persistence/$(basename ${links_source})" + local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})" mkdir -p ${cow_dir} chown_ref "${source}" "${cow_dir}" chmod_ref "${source}" "${cow_dir}" @@ -1540,7 +1490,14 @@ activate_custom_mounts () # bind-mount and union mount are handled the same # in read-only mode, but note that rootfs_dest_backing # is non-empty (and necessary) only for unions - cow_dir="/live/overlay/${dest}" + if [ -n "${rootmnt}" ] + then + local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/live/overlay/|")" + else + # This is happens if persistence is activated + # post boot + local cow_dir="/live/overlay/${dest}" + fi if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ] then # If an earlier custom mount has files here @@ -1566,32 +1523,6 @@ activate_custom_mounts () echo ${used_devices} } -fix_backwards_compatibility () -{ - local device dir opt backing include_list - device=${1} - dir=${2} - opt=${3} - - if [ -n "${PERSISTENCE_READONLY}" ] - then - return - fi - - backing="$(mount_persistence_media ${device})" - if [ -z "${backing}" ] - then - return - fi - - include_list="${backing}/${persistence_list}" - if [ ! -r "${include_list}" ] && [ ! -r "${backing}/${old_persistence_list}" ] - then - echo "# persistence backwards compatibility: -${dir} ${opt},source=." > "${include_list}" - fi -} - is_mountpoint () { directory="$1" diff --git a/scripts/boot/9990-mount-http.sh b/scripts/boot/9990-mount-http.sh index b557404..1b718c0 100755 --- a/scripts/boot/9990-mount-http.sh +++ b/scripts/boot/9990-mount-http.sh @@ -8,9 +8,8 @@ do_httpmount () for webfile in HTTPFS FTPFS FETCH do - local url extension dest - url="$(eval echo \"\$\{${webfile}\}\")" - extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')" + local url="$(eval echo \"\$\{${webfile}\}\")" + local extension="$(echo "${url}" | sed 's/\(.*\)\.\(.*\)/\2/')" if [ -n "$url" ] then @@ -21,7 +20,7 @@ do_httpmount () mkdir -p "${alt_mountpoint}" dest="${alt_mountpoint}" else - dest="${mountpoint}/${LIVE_MEDIA_PATH}" + local dest="${mountpoint}/${LIVE_MEDIA_PATH}" mount -t ramfs ram "${mountpoint}" mkdir -p "${dest}" fi diff --git a/scripts/boot/9990-mount-iscsi.sh b/scripts/boot/9990-mount-iscsi.sh index 6ce9851..fd29d91 100755 --- a/scripts/boot/9990-mount-iscsi.sh +++ b/scripts/boot/9990-mount-iscsi.sh @@ -7,8 +7,7 @@ do_iscsi() do_netsetup #modprobe ib_iser modprobe iscsi_tcp - local debugopt - debugopt="" + local debugopt="" [ "${DEBUG}" = "true" ] && debugopt="-d 8" #FIXME this name is supposed to be unique - some date + ifconfig hash? ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)" @@ -22,14 +21,12 @@ do_iscsi() then panic "Failed to log into iscsi target" fi - local host - host="$(ls -d /sys/class/scsi_host/host*/device/iscsi_host:host* \ - /sys/class/scsi_host/host*/device/iscsi_host/host* | sed -e 's:/device.*::' -e 's:.*host::')" + local host="$(ls -d /sys/class/scsi_host/host*/device/iscsi_host:host* \ + /sys/class/scsi_host/host*/device/iscsi_host/host* | sed -e 's:/device.*::' -e 's:.*host::')" if [ -n "${host}" ] then - local devices i - devices="" - i=0 + local devices="" + local i=0 while [ -z "${devices}" -a $i -lt 60 ] do sleep 1 diff --git a/scripts/boot/9990-netbase.sh b/scripts/boot/9990-netbase.sh index b3f886c..64e30df 100755 --- a/scripts/boot/9990-netbase.sh +++ b/scripts/boot/9990-netbase.sh @@ -135,5 +135,20 @@ EOF fi fi + #if [ ! -x /root/usr/sbin/NetworkManager ] + #then + # for i in eth0 eth1 eth2 ath0 wlan0 + # do + # grep -q "iface ${i}" ${IFFILE} && continue + # + #cat >> "${IFFILE}" << EOF + #allow-hotplug ${i} + #iface ${i} inet dhcp + # + #EOF + # + # done + #fi + log_end_msg } diff --git a/scripts/boot/9990-networking.sh b/scripts/boot/9990-networking.sh index f32ae6c..d9607b7 100755 --- a/scripts/boot/9990-networking.sh +++ b/scripts/boot/9990-networking.sh @@ -111,10 +111,6 @@ do_netsetup () for interface in ${DEVICE}; do ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config - # squeeze - [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf - - # wheezy [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf if [ "$IPV4ADDR" != "0.0.0.0" ] @@ -129,10 +125,6 @@ do_netsetup () # source relevant ipconfig output OLDHOSTNAME=${HOSTNAME} - # squeeze - [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf - - # wheezy [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME} diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 098111c..e8e00b6 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -189,58 +189,37 @@ setup_unionfs () done fi - local whitelistdev - whitelistdev="" - if [ -n "${PERSISTENCE_MEDIA}" ] - then - case "${PERSISTENCE_MEDIA}" in - removable) - whitelistdev="$(removable_dev)" - ;; + case "${PERSISTENCE_MEDIA}" in + removable) + whitelistdev="$(removable_dev)" + ;; - removable-usb) - whitelistdev="$(removable_usb_dev)" - ;; - esac - if [ -z "${whitelistdev}" ] - then - whitelistdev="ignore_all_devices" - fi - fi + removable-usb) + whitelistdev="$(removable_usb_dev)" + ;; + + *) + whitelistdev="" + ;; + esac if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD} then - overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}" + overlays="${custom_overlay_label}" fi - local overlay_devices - overlay_devices="" - if [ "${whitelistdev}" != "ignore_all_devices" ] - then - for media in $(find_persistence_media "${overlays}" "${whitelistdev}") - do - media="$(echo ${media} | tr ":" " ")" - - case ${media} in - ${old_root_overlay_label}=*) - device="${media#*=}" - fix_backwards_compatibility ${device} / union - overlay_devices="${overlay_devices} ${device}" - ;; - - ${old_home_overlay_label}=*) - device="${media#*=}" - fix_backwards_compatibility ${device} /home bind - overlay_devices="${overlay_devices} ${device}" - ;; + local overlay_devices="" + for media in $(find_persistence_media "${overlays}" "${whitelistdev}") + do + media="$(echo ${media} | tr ":" " ")" - ${custom_overlay_label}=*) - device="${media#*=}" - overlay_devices="${overlay_devices} ${device}" - ;; - esac - done - fi + case ${media} in + ${custom_overlay_label}=*) + device="${media#*=}" + overlay_devices="${overlay_devices} ${device}" + ;; + esac + done elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ] then # check if there are any nfs options @@ -335,8 +314,7 @@ setup_unionfs () 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}" + mount_full $unionmountopts "${unionmountpoint}" else cow_dir="/live/overlay${dir}" rootfs_dir="${rootfs}${dir}" @@ -386,18 +364,16 @@ setup_unionfs () # Adding custom persistence if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] then - local custom_mounts - custom_mounts="/tmp/custom_mounts.list" + local custom_mounts="/tmp/custom_mounts.list" rm -rf ${custom_mounts} 2> /dev/null # Gather information about custom mounts from devies detected as overlays get_custom_mounts ${custom_mounts} ${overlay_devices} - [ -n "${DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence" + [ -n "${DEBUG}" ] && cp ${custom_mounts} "/live/persistence" # Now we do the actual mounting (and symlinking) - local used_overlays - used_overlays="" + local used_overlays="" used_overlays=$(activate_custom_mounts ${custom_mounts}) rm ${custom_mounts} @@ -411,6 +387,28 @@ setup_unionfs () done fi + # move all mountpoints to root filesystem + for _DIRECTORY in rootfs persistence + do + if [ -d "/live/${_DIRECTORY}" ] + then + mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}" + + for _MOUNT in $(ls /live/${_DIRECTORY}) + do + mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" + mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ + mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" || \ + log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" + done + fi + done + + mkdir -p "${rootmnt}/lib/live/mount/overlay" + mount -o move /live/overlay "${rootmnt}/lib/live/mount/overlay" > /dev/null 2>&1 || \ + mount -o bind /live/overlay "${rootmnt}/lib/live/mount/overlay" || \ + log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/mount/overlay" + # ensure that a potentially stray tmpfs gets removed # otherways, initramfs-tools is unable to remove /live # and fails to boot |