Adding upstream version 3.0~a1.

diff --git a/Makefile b/Makefile
index dae4ec1..d38a949 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ build:
 install:
        # Installing executables
        mkdir -p $(DESTDIR)/sbin
-       cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile bin/live-toram $(DESTDIR)/sbin
+       cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile $(DESTDIR)/sbin
 
        mkdir -p $(DESTDIR)/usr/share/live-boot
        cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
@@ -77,27 +77,15 @@ install:
 
 uninstall:
        # Uninstalling executables
-       rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile $(DESTDIR)/sbin/live-toram
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
-
+       rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
        rm -rf $(DESTDIR)/usr/share/live-boot
-
        rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
        rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
        rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
 
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
-
        # Uninstalling docs
        rm -rf $(DESTDIR)/usr/share/doc/live-boot
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       # (FIXME)
 
        # Uninstalling manpages
        for MANPAGE in manpages/en/*; \
@@ -115,22 +103,8 @@ uninstall:
                done; \
        done
 
-       for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
-       do \
-               rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} || true; \
-               rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} || true; \
-       done
-
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man || true
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
-
-       rmdir --ignore-fail-on-non-empty $(DESTDIR) || true
-
 clean:
-       @echo "Nothing to clean."
 
-distclean: clean
-       @echo "Nothing to distclean."
+distclean:
 
 reinstall: uninstall install

diff --git a/VERSION b/VERSION
index b8061b5..cfb3a5a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.15
+3.0~a1

diff --git a/bin/live-snapshot b/bin/live-snapshot
index 991e704..08e5fd6 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -7,7 +7,7 @@
 #   for reuse in another live-boot session.
 #   Look at the manpage for more informations.
 #
-# Copyright (C) 2006-2010 Marco Amadori <marco.amadori@gmail.com>
+# Copyright (C) 2006-2008 Marco Amadori <marco.amadori@gmail.com>
 # Copyright (C) 2008 Chris Lamb <chris@chris-lamb.co.uk>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -39,7 +39,7 @@ fi
 
 . /usr/share/initramfs-tools/scripts/live-helpers
 
-LIVE_CONF="/etc/live/boot.d/snapshot.conf"
+LIVE_CONF="/etc/live.conf"
 
 if [ -r "${LIVE_CONF}" ]
 then
@@ -242,7 +242,7 @@ Defaults ()
        # Parse resync string
        if [ -n "${SNAP_RESYNC_STRING}" ]
        then
-               SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -r -e 's#^([^:]*).*$#'"${DEF_SNAP_COW}"'\1#')
+               SNAP_COW=$(echo "${SNAP_RESYNC_STRING}" | sed -e 's|^/root\([^:.]*\).*$|'"${DEF_SNAP_COW}"'\1|')
                SNAP_DEV=$(echo "${SNAP_RESYNC_STRING}" | cut -f2 -d ':')
                SNAP_MNT=$(echo "${SNAP_RESYNC_STRING}" | cut -f3 -d ':')
                DEST="${MOUNTP}/${SNAP_MNT}"

diff --git a/bin/live-toram b/bin/live-toram
deleted file mode 100755 (executable)
index b7740a2..0000000
--- a/bin/live-toram
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Read cmdline
-for _PARAMETER in $(cat /proc/cmdline)
-do
-       case "${_PARAMETER}" in
-               module=*)
-                       _MODULE="${_PARAMETER#module=}"
-                       ;;
-       esac
-done
-
-# Assemble filesystems
-if [ -z "${_MODULE}" ]
-then
-       _FILESYSTEMS="/live/image/live/filesystem.squashfs"
-else
-       for _FILESYSTEM in _MODULE
-       do
-               _FILESYSTEMS="${_FILESYSTEMS} /live/image/live/${_FILESYSTEM}"
-       done
-fi
-
-# Exit if system is not debian live
-if [ ! -d /live/image ]
-then
-       echo "E: live-toram only works on Debian Live systems."
-
-       exit 1
-fi
-
-# Exit if filesystem not accessible
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
-       if [ ! -r ${_FILESYSTEM} ]
-       then
-               echo "E: ${_FILESYSTEM}: No such file"
-               echo "I: live-toram already run?"
-
-               exit 1
-       fi
-done
-
-# Exit if user is unprivileged
-if [ "$(id -u)" -ne 0 ]
-then
-       echo "E: need root privileges"
-
-       exit 1
-fi
-
-# Exit if not enough free memory
-_SIZE=0
-
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
-       _SIZE="$((${_SIZE} + $(du ${_FILESYSTEM} | awk '{ print $1 }')))"
-       _MEMORY="$(awk '/MemFree/ { print $2 }' /proc/meminfo)"
-done
-
-case ${@} in
-       -f|--force)
-               echo "W: Ignoring memory constrains as requested"
-               ;;
-
-       *)
-               if [ $_MEMORY -lt $_SIZE ]
-               then
-                       echo "E: not enough free memory available."
-                       echo "I: images need ${_SIZE}kB, free memory is ${_MEMORY}kB."
-
-                       exit 1
-               fi
-               ;;
-esac
-
-# Copying image to memory
-echo "P: Copying images to memory."
-echo "P: This may take a while..."
-
-# FIXME: doesn't work with multiple filesystems
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
-       if [ ! -x "$(which rsync 2>/dev/null)" ]
-       then
-               rsync -a --progress ${_FILESYSTEM} /tmp/live
-       else
-               cp -av ${_FILESYSTEM} /tmp/live
-       fi
-
-LANGUAGE=C LANG=C LC_ALL=C perl << EOF
-open LOOP, '</dev/loop0' or die $!;
-open DEST, '</tmp/live' or die $!;
-ioctl(LOOP, 0x4C06, fileno(DEST)) or die $!
-close LOOP;
-close DEST;
-EOF
-
-done
-
-# Unmounting live media
-_DEVICE="$(awk '/\/live\/image / { print $1 }' /proc/mounts)"
-
-if [ -d /live/image ]
-then
-       umount /live/image
-       rmdir --ignore-fail-on-non-empty /live/image || true
-fi
-
-# Ejecting live media if it is not an optical device
-if [ "$(expr substr ${_DEVICE} 1 2)" != "sd" ] && \
-   ! readlink /sys/block/$(expr substr ${_DEVICE} 6 3) | grep -q usb
-then
-       if [ ! -x "$(which rsync 2>/dev/null)" ]
-       then
-               eject -p -m ${_DEVICE} >/dev/null 2>&1
-       fi
-fi

diff --git a/hooks/live b/hooks/live
index cebe9c9..c2292d5 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -30,9 +30,9 @@ then
        . /etc/live/boot.conf
 fi
 
-if ls /etc/live/boot.d/* > /dev/null 2>&1
+if ls /etc/live/boot.conf.d/* > /dev/null 2>&1
 then
-       for _FILE in /etc/live/boot.d/*
+       for _FILE in /etc/live/boot.conf.d/*
        do
                . ${_FILE}
        done
@@ -61,7 +61,7 @@ cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-       if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1
+       if [ ! -e "${DESTDIR}"/"${FILE}" ]
        then
                cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
        fi
@@ -175,8 +175,7 @@ copy_exec /usr/bin/md5sum /bin
 if [ -x /usr/bin/memdiskfind ]
 then
        copy_exec /usr/bin/memdiskfind
-       manual_add_modules phram
-       manual_add_modules mtdblock
+       manual_add_modules phram mtdblock
 fi
 
 # Program: cpio
@@ -191,12 +190,7 @@ copy_exec /bin/cpio /bin
 # Program: udev
 if [ -x /sbin/udevadm ]
 then
-       # lenny
        copy_exec /sbin/udevadm /sbin
-else
-       # etch
-       copy_exec /sbin/udevtrigger /sbin
-       copy_exec /sbin/udevsettle /sbin
 fi
 if [ -x /usr/bin/udevinfo ]
 then
@@ -252,10 +246,3 @@ then
        #mkdir -p $DESTDIR/etc
        #cp -p /etc/nsswitch.conf $DESTDIR/etc
 fi
-
-if [ "${LIVE_UNIONMOUNT}" = "true" ]
-then
-       # UnionMount
-       # only mount from patched util-linux can do this currently
-       copy_exec /bin/mount /bin/mount_full
-fi

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 2043378..fd51e64 100644 (file)
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2011\-02\-01 2.0.15 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 10.08.2010 3.0~a1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
@@ -38,8 +38,8 @@ see below.
 .SS Konfigurationsdateien
 \fBlive\-boot\fP can be configured (but not activated) through configuration
 files. Those files can be placed either in the root filesystem itself
-(/etc/live/boot.conf, /etc/live/boot.d/), or on the live media
-(live/boot.conf, live/boot.d/).
+(/etc/live/boot.conf, /etc/live/boot.conf.d/), or on the live media
+(live/boot.conf, live/boot.conf.d/).
 
 .SH OPTIONEN
 .\" FIXME
@@ -161,31 +161,20 @@ has been installed with persistent enabled.
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
 .IP \fBswapon\fP 4
 This parameter enables usage of local swap partitions.
-.IP \fBpersistent\fP[={nofiles|cryptsetup}] 4
+.IP \fBpersistent\fP[=nofiles] 4
 live\-boot will look for persistent and snapshot partitions or files labeled
 "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try
 to, in order: mount as /cow the first, mount the second in /home, and just
 copy the contents of the latter in appropriate locations
 (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look
-at live\-snapshot(1) for more informations.
-.br
-If "nofiles" is specified, only filesystems with matching labels will be
-searched; no filesystems will be traversed looking for archives or image
-files. This results in shorter boot times.
-.br
-If "cryptsetup" is specified, filesystems stored on Luks\-encrypted devices
-will be considered as well as others when searching for a persistence
-filesystem; the user will be prompted for any needed decryption passphrase.
+at live\-snapshot(1) for more informations. If "nofiles" is specified, only
+filesystems with matching labels will be searched; no filesystems will be
+traversed looking for archives or image files. This results in shorter boot
+times.
 .IP \fBpersistent\-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 \fBpersistent\-subtext\fP=\fISUFFIX\fP 4
-Add a suffix when searching for the image filenames or partition labels to
-use for the above mentioned persistent 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
-persistent storage choices.
 .IP {\fBpreseed/file\fP|\fBfile\fP}=\fIFILE\fP 4
 A path to a file present on the rootfs could be used to preseed debconf
 database.
@@ -247,16 +236,16 @@ directory with a tmpfs on the original path.
 
 .SH DATEIEN
 .IP \fB/etc/live/boot.conf\fP 4
-.IP \fB/etc/live/boot.d/\fP 4
+.IP \fB/etc/live/boot.conf.d/\fP 4
 .IP \fBlive/boot.conf\fP 4
-.IP \fBlive/boot.d/\fP 4
+.IP \fBlive/boot.conf.d/\fP 4
 
 .SH "SIEHE AUCH"
 \fIlive\-snapshot\fP(1)
 .PP
-\fIlive\-build\fP(7)
-.PP
 \fIlive\-config\fP(7)
+.PP
+\fIlive\-helper\fP(7)
 
 .SH HOMEPAGE
 Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 4164402..a000b8c 100644 (file)
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 2011\-02\-01 2.0.15 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 10.08.2010 3.0~a1 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage
@@ -83,18 +83,13 @@ This saves expensive writes and speeds up operations on volatile data such
 as web caches and temporary files (like e.g. /tmp and .mozilla) which are
 regenerated each time. This is achieved by bind mounting each listed
 directory with a tmpfs on the original path.
-.IP \fB/etc/live\-snapshot.list\fP 4
-This optional file, if present changes the behaviour of live\-snapshot: only
-files and directories listed there are included (integrally) in the
-snapshot. Beware, it is an experimental feature that only works for cpio
-targets now.
 
 .SH "SIEHE AUCH"
 \fIlive\-boot\fP(1)
 .PP
-\fIlive\-build\fP(7)
-.PP
 \fIlive\-config\fP(7)
+.PP
+\fIlive\-helper\fP(7)
 
 .SH HOMEPAGE
 Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 8a756f8..f5328da 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2011\-02\-01 2.0.15 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-08\-10 3.0~a1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -21,7 +21,7 @@ At boot time it will look for a (read\-only) media containing a "/live" director
 In addition, there are some more boot parameters to influence the behaviour, see below.
 
 .SS Configuration Files
-\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot.d/), or on the live media (live/boot.conf, live/boot.d/).
+\fBlive\-boot\fR 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.conf.d/), or on the live media (live/boot.conf, live/boot.conf.d/).
 
 .SH OPTIONS
 \fBlive\-boot\fR currently features the following parameters.
@@ -100,16 +100,10 @@ disables the "persistent" feature, useful if the bootloader (like syslinux) has
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
 .IP "\fBswapon\fR" 4
 This parameter enables usage of local swap partitions.
-.IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 4
-live\-boot will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at live\-snapshot(1) for more informations.
-.br
-If "nofiles" is specified, only filesystems with matching labels will be searched; no filesystems will be traversed looking for archives or image files. This results in shorter boot times.
-.br
-If "cryptsetup" is specified, filesystems stored on Luks\-encrypted devices will be considered as well as others when searching for a persistence filesystem; the user will be prompted for any needed decryption passphrase.
+.IP "\fBpersistent\fR[=nofiles]" 4
+live\-boot will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at live\-snapshot(1) for more informations. If "nofiles" is specified, only filesystems with matching labels will be searched; no filesystems will be traversed looking for archives or image files. This results in shorter boot times.
 .IP "\fBpersistent\-path\fR=\fIPATH\fR" 4
 live\-boot will look for persistency files in the root directory of a partition, with this parameter, the path can be configured so that you can have multiple directories on the same partition to store persistency files.
-.IP "\fBpersistent\-subtext\fR=\fISUFFIX\fR" 4
-Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistent 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 persistent storage choices.
 .IP "{\fBpreseed/file\fR|\fBfile\fR}=\fIFILE\fR" 4
 A path to a file present on the rootfs could be used to preseed debconf database.
 .IP "\fBpackage/question\fR=\fIVALUE\fR" 4
@@ -142,16 +136,16 @@ This saves expensive writes and speeds up operations on volatile data such as we
 
 .SH FILES
 .IP "\fB/etc/live/boot.conf\fR" 4
-.IP "\fB/etc/live/boot.d/\fR" 4
+.IP "\fB/etc/live/boot.conf.d/\fR" 4
 .IP "\fBlive/boot.conf\fR" 4
-.IP "\fBlive/boot.d/\fR" 4
+.IP "\fBlive/boot.conf.d/\fR" 4
 
 .SH SEE ALSO
 \fIlive\-snapshot\fR(1)
 .PP
-\fIlive\-build\fR(7)
-.PP
 \fIlive\-config\fR(7)
+.PP
+\fIlive\-helper\fR(7)
 
 .SH HOMEPAGE
 More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 60d8de2..e05fdd8 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2011\-02\-01 2.0.15 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-08\-10 3.0~a1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage
@@ -48,15 +48,13 @@ This optional file (inside the live media) contains a list of white\-space or ca
 This optional file (which resides in the rootfs system, not in the live media) is used as a list of directories which not need be persistent: ie. their content does not need to survive reboots when using the persistence features.
 .br
 This saves expensive writes and speeds up operations on volatile data such as web caches and temporary files (like e.g. /tmp and .mozilla) which are regenerated each time. This is achieved by bind mounting each listed directory with a tmpfs on the original path.
-.IP "\fB/etc/live\-snapshot.list\fR" 4
-This optional file, if present changes the behaviour of live\-snapshot: only files and directories listed there are included (integrally) in the snapshot. Beware, it is an experimental feature that only works for cpio targets now.
 
 .SH SEE ALSO
 \fIlive\-boot\fR(1)
 .PP
-\fIlive\-build\fR(7)
-.PP
 \fIlive\-config\fR(7)
+.PP
+\fIlive\-helper\fR(7)
 
 .SH HOMEPAGE
 More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 65231b2..7786800 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 2.0.15\n"
-"POT-Creation-Date: 2011-02-01 22:48+0100\n"
+"Project-Id-Version: live-boot 3.0~a1\n"
+"POT-Creation-Date: 2010-08-10 02:01+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-02-01"
-msgstr ""
+msgid "2010-08-10"
+msgstr "10.08.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.15"
-msgstr "2.0.15"
+msgid "3.0~a1"
+msgstr "3.0~a1"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -131,8 +131,8 @@ msgstr "Konfigurationsdateien"
 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.d/), or on the live media (live/boot.conf, "
-"live/boot.d/)."
+"live/boot.conf, /etc/live/boot.conf.d/), or on the live media (live/boot."
+"conf, live/boot.conf.d/)."
 msgstr ""
 
 #. type: SH
@@ -522,8 +522,8 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
-msgstr "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<persistent>[=nofiles]"
+msgstr "B<persistent>[=nofiles]"
 
 #. type: Plain text
 #: en/live-boot.7:105
@@ -533,33 +533,20 @@ msgid ""
 "will try to, in order: mount as /cow the first, mount the second in /home, "
 "and just copy the contents of the latter in appropriate locations "
 "(snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look "
-"at live-snapshot(1) for more informations."
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:107
-msgid ""
-"If \"nofiles\" is specified, only filesystems with matching labels will be "
-"searched; no filesystems will be traversed looking for archives or image "
-"files. This results in shorter boot times."
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:109
-msgid ""
-"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
-"will be considered as well as others when searching for a persistence "
-"filesystem; the user will be prompted for any needed decryption passphrase."
+"at live-snapshot(1) for more informations. If \"nofiles\" is specified, only "
+"filesystems with matching labels will be searched; no filesystems will be "
+"traversed looking for archives or image files. This results in shorter boot "
+"times."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:105
 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr "B<persistent-path>=I<PATH>"
 
 #. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:107
 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 "
@@ -567,42 +554,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:111
-#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
-msgstr "B<persistent-subtext>=I<SUFFIX>"
-
-#. type: Plain text
-#: en/live-boot.7:113
-msgid ""
-"Add a suffix when searching for the image filenames or partition labels to "
-"use for the above mentioned persistent 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 "
-"persistent storage choices."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:107
 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr "{B<preseed/file>|B<file>}=I<FILE>"
 
 #. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:109
 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:109
 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr "B<package/question>=I<VALUE>"
 
 #. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:111
 msgid ""
 "All debian installed packages could be preseeded from command-line that way, "
 "beware of blanks spaces, they will interfere with parsing, use a preseed "
@@ -610,26 +581,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:111
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr "B<quickreboot>"
 
 #. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:113
 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:119
+#: en/live-boot.7:113
 #, no-wrap
 msgid "B<showmounts>"
 msgstr "B<showmounts>"
 
 #. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:115
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -638,26 +609,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:115
 #, no-wrap
 msgid "B<silent>"
 msgstr "B<silent>"
 
 #. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:117
 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:123
+#: en/live-boot.7:117
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr "B<todisk>=I<DEVICE>"
 
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:119
 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 "
@@ -667,13 +638,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:119
 #, no-wrap
 msgid "B<toram>"
 msgstr "B<toram>"
 
 #. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:121
 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 "
@@ -681,14 +652,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:121
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr "B<union>=aufs|unionfs"
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:130
+#: en/live-boot.7:124
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
@@ -696,32 +667,32 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:132
+#: en/live-boot.7:126
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 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 \"/"
@@ -734,13 +705,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:133 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -749,7 +720,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:136 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -758,64 +729,64 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: IP
-#: en/live-boot.7:144
+#: en/live-boot.7:138
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr "B</etc/live/boot.conf>"
 
 #. type: IP
-#: en/live-boot.7:145
+#: en/live-boot.7:139
 #, no-wrap
-msgid "B</etc/live/boot.d/>"
-msgstr "B</etc/live/boot.d/>"
+msgid "B</etc/live/boot.conf.d/>"
+msgstr "B</etc/live/boot.conf.d/>"
 
 #. type: IP
-#: en/live-boot.7:146
+#: en/live-boot.7:140
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr "B<live/boot.conf>"
 
 #. type: IP
-#: en/live-boot.7:147
+#: en/live-boot.7:141
 #, no-wrap
-msgid "B<live/boot.d/>"
-msgstr "B<live/boot.d/>"
+msgid "B<live/boot.conf.d/>"
+msgstr "B<live/boot.conf.d/>"
 
 #. type: SH
-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:143 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-boot.7:151
+#: en/live-boot.7:145
 msgid "I<live-snapshot>(1)"
 msgstr "I<live-snapshot>(1)"
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
-msgid "I<live-build>(7)"
-msgstr "I<live-build>(7)"
-
-#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:147 en/live-snapshot.1:56
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
+#. type: Plain text
+#: en/live-boot.7:149 en/live-snapshot.1:58
+msgid "I<live-helper>(7)"
+msgstr "I<live-helper>(7)"
+
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:150 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:152 en/live-snapshot.1:61
 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 "
@@ -826,13 +797,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-boot.7:159 en/live-snapshot.1:64
+#: en/live-boot.7:153 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:155 en/live-snapshot.1:64
 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 "
@@ -846,13 +817,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:67
+#: en/live-boot.7:156 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:157 en/live-snapshot.1:66
 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/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 0a06cec..5d72e82 100644 (file)
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 2.0.15\n"
-"POT-Creation-Date: 2011-02-01 22:48+0100\n"
+"Project-Id-Version: live-boot 3.0~a1\n"
+"POT-Creation-Date: 2010-08-10 02:01+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-02-01"
-msgstr ""
+msgid "2010-08-10"
+msgstr "10.08.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.15"
-msgstr "2.0.15"
+msgid "3.0~a1"
+msgstr "3.0~a1"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -58,26 +58,26 @@ msgid "OPTIONS"
 msgstr "OPTIONEN"
 
 #. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr "B</etc/live.conf>"
 
 #. type: Plain text
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr "B<live/filesystem.module>"
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 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 \"/"
@@ -90,13 +90,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr "B</etc/live-persistence.binds>"
 
 #. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:133 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -105,7 +105,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:136 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -114,35 +114,35 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr "DATEIEN"
 
 #. type: SH
-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:143 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
-msgid "I<live-build>(7)"
-msgstr "I<live-build>(7)"
-
-#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:147 en/live-snapshot.1:56
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
+#. type: Plain text
+#: en/live-boot.7:149 en/live-snapshot.1:58
+msgid "I<live-helper>(7)"
+msgstr "I<live-helper>(7)"
+
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:150 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:152 en/live-snapshot.1:61
 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 "
@@ -153,13 +153,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-boot.7:159 en/live-snapshot.1:64
+#: en/live-boot.7:153 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:155 en/live-snapshot.1:64
 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 "
@@ -173,13 +173,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:67
+#: en/live-boot.7:156 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:157 en/live-snapshot.1:66
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -365,22 +365,7 @@ msgstr "-v, --version"
 msgid "output version information and exit."
 msgstr ""
 
-#. type: IP
-#: en/live-snapshot.1:51
-#, no-wrap
-msgid "B</etc/live-snapshot.list>"
-msgstr "B</etc/live-snapshot.list>"
-
-#. type: Plain text
-#: en/live-snapshot.1:53
-msgid ""
-"This optional file, if present changes the behaviour of live-snapshot: only "
-"files and directories listed there are included (integrally) in the "
-"snapshot. Beware, it is an experimental feature that only works for cpio "
-"targets now."
-msgstr ""
-
 #. type: Plain text
-#: en/live-snapshot.1:56
+#: en/live-snapshot.1:54
 msgid "I<live-boot>(1)"
 msgstr "I<live-boot>(1)"

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 706624b..836bde9 100644 (file)
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,14 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2011-02-01 22:48+0100\n"
+"POT-Creation-Date: 2010-08-10 02:01+0300\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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -25,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-02-01"
+msgid "2010-08-10"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.15"
+msgid "3.0~a1"
 msgstr ""
 
 #. type: TH
@@ -126,8 +125,8 @@ msgstr ""
 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.d/), or on the live media (live/boot.conf, "
-"live/boot.d/)."
+"live/boot.conf, /etc/live/boot.conf.d/), or on the live media (live/boot."
+"conf, live/boot.conf.d/)."
 msgstr ""
 
 #. type: SH
@@ -517,7 +516,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:103
 #, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<persistent>[=nofiles]"
 msgstr ""
 
 #. type: Plain text
@@ -528,33 +527,20 @@ msgid ""
 "will try to, in order: mount as /cow the first, mount the second in /home, "
 "and just copy the contents of the latter in appropriate locations "
 "(snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look "
-"at live-snapshot(1) for more informations."
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:107
-msgid ""
-"If \"nofiles\" is specified, only filesystems with matching labels will be "
-"searched; no filesystems will be traversed looking for archives or image "
-"files. This results in shorter boot times."
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:109
-msgid ""
-"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
-"will be considered as well as others when searching for a persistence "
-"filesystem; the user will be prompted for any needed decryption passphrase."
+"at live-snapshot(1) for more informations. If \"nofiles\" is specified, only "
+"filesystems with matching labels will be searched; no filesystems will be "
+"traversed looking for archives or image files. This results in shorter boot "
+"times."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:105
 #, no-wrap
 msgid "B<persistent-path>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:107
 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 "
@@ -562,42 +548,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:111
-#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:113
-msgid ""
-"Add a suffix when searching for the image filenames or partition labels to "
-"use for the above mentioned persistent 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 "
-"persistent storage choices."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:107
 #, no-wrap
 msgid "{B<preseed/file>|B<file>}=I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:109
 msgid ""
 "A path to a file present on the rootfs could be used to preseed debconf "
 "database."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:115
+#: en/live-boot.7:109
 #, no-wrap
 msgid "B<package/question>=I<VALUE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:111
 msgid ""
 "All debian installed packages could be preseeded from command-line that way, "
 "beware of blanks spaces, they will interfere with parsing, use a preseed "
@@ -605,26 +575,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:117
+#: en/live-boot.7:111
 #, no-wrap
 msgid "B<quickreboot>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:113
 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:119
+#: en/live-boot.7:113
 #, no-wrap
 msgid "B<showmounts>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:115
 msgid ""
 "This parameter will make live-boot to show on \"/\" the ro filesystems "
 "(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -633,26 +603,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:121
+#: en/live-boot.7:115
 #, no-wrap
 msgid "B<silent>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:117
 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:123
+#: en/live-boot.7:117
 #, no-wrap
 msgid "B<todisk>=I<DEVICE>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:119
 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 "
@@ -662,13 +632,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:125
+#: en/live-boot.7:119
 #, no-wrap
 msgid "B<toram>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:121
 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 "
@@ -676,14 +646,14 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:127
+#: en/live-boot.7:121
 #, no-wrap
 msgid "B<union>=aufs|unionfs"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/live-boot.7:130
+#: en/live-boot.7:124
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
 "unionfs."
@@ -691,32 +661,32 @@ msgstr ""
 
 #.  FIXME
 #. type: SH
-#: en/live-boot.7:132
+#: en/live-boot.7:126
 #, no-wrap
 msgid "FILES (old)"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 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 \"/"
@@ -729,13 +699,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:133 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -744,7 +714,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:136 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -753,64 +723,64 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:144
+#: en/live-boot.7:138
 #, no-wrap
 msgid "B</etc/live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:145
+#: en/live-boot.7:139
 #, no-wrap
-msgid "B</etc/live/boot.d/>"
+msgid "B</etc/live/boot.conf.d/>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:146
+#: en/live-boot.7:140
 #, no-wrap
 msgid "B<live/boot.conf>"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:147
+#: en/live-boot.7:141
 #, no-wrap
-msgid "B<live/boot.d/>"
+msgid "B<live/boot.conf.d/>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:143 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:151
+#: en/live-boot.7:145
 msgid "I<live-snapshot>(1)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
-msgid "I<live-build>(7)"
+#: en/live-boot.7:147 en/live-snapshot.1:56
+msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:60
-msgid "I<live-config>(7)"
+#: en/live-boot.7:149 en/live-snapshot.1:58
+msgid "I<live-helper>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:150 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:152 en/live-snapshot.1:61
 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 "
@@ -818,13 +788,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:159 en/live-snapshot.1:64
+#: en/live-boot.7:153 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:155 en/live-snapshot.1:64
 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 "
@@ -833,13 +803,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:67
+#: en/live-boot.7:156 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:157 en/live-snapshot.1:66
 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/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 2cee48b..ce1ac78 100644 (file)
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,14 +7,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2011-02-01 22:48+0100\n"
+"POT-Creation-Date: 2010-08-10 02:01+0300\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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: ENCODING"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -25,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-02-01"
+msgid "2010-08-10"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0.15"
+msgid "3.0~a1"
 msgstr ""
 
 #. type: TH
@@ -59,26 +58,26 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:127 en/live-snapshot.1:43
 #, no-wrap
 msgid "B</etc/live.conf>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 msgid ""
 "Some variables can be configured via this config file (inside the live "
 "system)."
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:135 en/live-snapshot.1:45
+#: en/live-boot.7:129 en/live-snapshot.1:45
 #, no-wrap
 msgid "B<live/filesystem.module>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 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 \"/"
@@ -91,13 +90,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:137 en/live-snapshot.1:47
+#: en/live-boot.7:131 en/live-snapshot.1:47
 #, no-wrap
 msgid "B</etc/live-persistence.binds>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:139 en/live-snapshot.1:49
+#: en/live-boot.7:133 en/live-snapshot.1:49
 msgid ""
 "This optional file (which resides in the rootfs system, not in the live "
 "media) is used as a list of directories which not need be persistent: ie. "
@@ -106,7 +105,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:142 en/live-snapshot.1:51
+#: en/live-boot.7:136 en/live-snapshot.1:51
 msgid ""
 "This saves expensive writes and speeds up operations on volatile data such "
 "as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -115,35 +114,35 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:143 en/live-snapshot.1:42
+#: en/live-boot.7:137 en/live-snapshot.1:42
 #, no-wrap
 msgid "FILES"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:143 en/live-snapshot.1:52
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
-msgid "I<live-build>(7)"
+#: en/live-boot.7:147 en/live-snapshot.1:56
+msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:60
-msgid "I<live-config>(7)"
+#: en/live-boot.7:149 en/live-snapshot.1:58
+msgid "I<live-helper>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:150 en/live-snapshot.1:59
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:152 en/live-snapshot.1:61
 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 "
@@ -151,13 +150,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:159 en/live-snapshot.1:64
+#: en/live-boot.7:153 en/live-snapshot.1:62
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:155 en/live-snapshot.1:64
 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 "
@@ -166,13 +165,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:67
+#: en/live-boot.7:156 en/live-snapshot.1:65
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:157 en/live-snapshot.1:66
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."
@@ -354,22 +353,7 @@ msgstr ""
 msgid "output version information and exit."
 msgstr ""
 
-#. type: IP
-#: en/live-snapshot.1:51
-#, no-wrap
-msgid "B</etc/live-snapshot.list>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-snapshot.1:53
-msgid ""
-"This optional file, if present changes the behaviour of live-snapshot: only "
-"files and directories listed there are included (integrally) in the "
-"snapshot. Beware, it is an experimental feature that only works for cpio "
-"targets now."
-msgstr ""
-
 #. type: Plain text
-#: en/live-snapshot.1:56
+#: en/live-snapshot.1:54
 msgid "I<live-boot>(1)"
 msgstr ""

diff --git a/scripts/live b/scripts/live
index f87919d..a17eb42 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -462,7 +462,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+       if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -471,9 +471,6 @@ is_nice_device ()
        elif echo ${sysfs_path} | grep -q "^/block/dm-"
        then
                return 0
-       elif echo ${sysfs_path} | grep -q "^/block/mtdblock"
-       then
-               return 0
        fi
 
        return 1
@@ -899,8 +896,6 @@ do_snap_copy ()
 
        if [ -b "${fromdev}" ]
        then
-               log_success_msg "Copying snapshot ${fromdev} to ${todir}..."
-
                # look for free mem
                if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]
                then
@@ -938,8 +933,9 @@ do_snap_copy ()
 
                return 0
        else
-               log_warning_msg "Unable to find the snapshot ${snap_type} medium"
                return 1
+
+               log_warning_msg "Unable to find the snapshot ${snap_type} medium"
        fi
 }
 
@@ -947,17 +943,16 @@ find_snap ()
 {
        # Look for ${snap_label}.* in block devices
        snap_label="${1}"
-       black_listed_devices="${2}"
 
        if [ "${PERSISTENT}" != "nofiles" ]
        then
                # search for image files
-               snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}")
+               snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2")
        fi
 
        if [ -z "${snapdata}" ]
        then
-               snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}")
+               snapdata=$(find_cow_device "${snap_label}")
        fi
        echo "${snapdata}"
 }
@@ -970,16 +965,6 @@ try_snap ()
        snapdata="${1}"
        snap_mount="${2}"
        snap_type="${3}"
-       snap_relpath="${4}"
-
-       if [ -z "${snap_relpath}" ]
-       then
-               # root snapshot, default usage
-               snap_relpath="/"
-       else
-               # relative snapshot (actually used just for "/home" snapshots)
-               snap_mount="${2}${snap_relpath}"
-       fi
 
        if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
        then
@@ -1017,16 +1002,8 @@ try_snap ()
                                cpioargs='--unconditional --make-directories'
                        fi
 
-                       if [ -s "${snapback}/${snapfile}" ]
-                       then
-                               BEFOREDIR="$(pwd)"
-                               cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
-                               RES="$?"
-                               cd "${BEFOREDIR}"
-                       else
-                               log_warning_msg "${snapback}/${snapfile} is empty, adding it for sync on reboot."
-                               RES="0"
-                       fi
+                       cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
+                       RES="$?"
 
                        if [ "${RES}" != "0" ]
                        then
@@ -1058,7 +1035,7 @@ try_snap ()
 
                if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
                then
-                       log_warning_msg "Impossible to include the ${snap_type} Snapshot (i)"
+                       log_warning_msg "Impossible to include the ${snap_type} Snapshot"
                        return 1
                else
                        if [ -n "${snapfile}" ]
@@ -1068,11 +1045,11 @@ try_snap ()
                        fi
                fi
        else
-               log_warning_msg "Impossible to include the ${snap_type} Snapshot (o)"
+               log_warning_msg "Impossible to include the ${snap_type} Snapshot"
                return 1
        fi
 
-       echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
+       echo "export ${snap_type}SNAP="/cow${snap_mount#$rootmnt}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt
        return 0
 }
 
@@ -1209,16 +1186,9 @@ setup_unionfs ()
                                        log_warning_msg "Unknown file system type on ${backdev} (${image}), assuming ${fstype}."
                                fi
 
-                               if [ "${UNIONTYPE}" != "unionmount" ]
-                               then
-                                       mpoint="${croot}/${imagename}"
-                                       rofsstring="${mpoint}=${roopt}:${rofsstring}" && rofslist="${mpoint} ${rofslist}"
-                               else
-                                       mpoint="${rootmnt}"
-                               fi
-                               mkdir -p "${mpoint}"
-                               log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\""
-                               mount -t "${fstype}" -o ro,noatime "${backdev}" "${mpoint}" || panic "Can not mount ${backdev} (${image}) on ${mpoint}"
+                               mkdir -p "${croot}/${imagename}"
+                               log_begin_msg "Mounting \"${image}\" on \"${croot}${imagename}\" via \"${backdev}\""
+                               mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
                                log_end_msg
                        fi
                done
@@ -1332,9 +1302,6 @@ setup_unionfs ()
                cow_mountopt="rw,noatime,mode=755"
        fi
 
-       if [ "${UNIONTYPE}" != "unionmount" ]
-       then
-
        if [ "${cow_fstype}" = "nfs" ]
        then
                log_begin_msg \
@@ -1345,7 +1312,6 @@ setup_unionfs ()
                mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
                        panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
        fi
-       fi
 
        rofscount=$(echo ${rofslist} |wc -w)
 
@@ -1390,10 +1356,6 @@ setup_unionfs ()
                                pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
                                ;;
 
-                       unionmount)
-                               mount_full -t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice} "${rootmnt}" || panic "${UNIONTYPE} ${cowdevice} on ${rootmnt} failed with option noatime,union,${cow_mountopt}"
-                               ;;
-
                        *)
                                mount -t ${UNIONTYPE} -o noatime,${noxino_opt}dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option noatime,${noxino_opt}dirs=/cow=rw:${rofsstring}"
                                ;;
@@ -1425,7 +1387,7 @@ setup_unionfs ()
                # Look for other snapshots to copy in
                try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
                # This second type should be removed when snapshot grow smarter
-               try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
+               try_snap "${home_snapdata}" "${rootmnt}/home" "HOME"
        fi
 
        if [ -n "${SHOWMOUNTS}" ]
@@ -1488,7 +1450,7 @@ check_dev ()
                        echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
                else
                        mkdir /isofrom
-                       mount -t auto "$ISO_DEVICE" /isofrom
+                       mount "$ISO_DEVICE" /isofrom
                        ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
                        loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                        devname="${loopdevname}"
@@ -1664,6 +1626,16 @@ find_livefs ()
        return 1
 }
 
+set_usplash_timeout ()
+{
+       if [ -x /sbin/usplash_write ]
+       then
+               /sbin/usplash_write "TIMEOUT 120"
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "TIMEOUT 120"
+       fi ; fi
+}
+
 integrity_check ()
 {
        media_mountpoint="${1}"
@@ -1690,6 +1662,14 @@ integrity_check ()
        fi
 }
 
+start_usplash_pulse ()
+{
+       if [ -x /sbin/usplash_write ]
+       then
+               /sbin/usplash_write "PULSELOGO"
+       fi
+}
+
 mountroot ()
 {
         if [ -x /scripts/local-top/cryptroot ]; then
@@ -1708,6 +1688,9 @@ mountroot ()
 
        Arguments
 
+       set_usplash_timeout
+       start_usplash_pulse
+
        maybe_break live-premount
        log_begin_msg "Running /scripts/live-premount"
        run_scripts /scripts/live-premount
@@ -1716,6 +1699,8 @@ mountroot ()
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
+       set_usplash_timeout
+
        if [ ! -z "${NETBOOT}" ] || [ ! -z "${FETCH}" ] || [ ! -z "${HTTPFS}" ] || [ ! -z "${FTPFS}" ]
        then
                if do_netmount
@@ -1828,24 +1813,6 @@ mountroot ()
                mount --move /live/image /root/live/image
        fi
 
-       # aufs2 in kernel versions around 2.6.33 has a regression:
-       # directories can't be accessed when read for the first the time,
-       # causing a failure for example when accessing /var/lib/fai
-       # when booting FAI, this simple workaround solves it
-       ls /root/* >/dev/null 2>&1
-
-       # copy snapshot configuration if exists
-       if [ -f snapshot.conf ]
-       then
-               log_begin_msg "Copying snapshot.conf to ${rootmnt}/etc/live/boot.d"
-               if [ ! -d "${rootmnt}/etc/live/boot.d" ]
-               then
-                       mkdir -p "${rootmnt}/etc/live/boot.d"
-               fi
-               cp snapshot.conf "${rootmnt}/etc/live/boot.d/"
-               log_end_msg
-       fi
-
        maybe_break live-bottom
        log_begin_msg "Running /scripts/live-bottom\n"
 

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 31e1e72..ba4a7a3 100755 (executable)
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -66,15 +66,7 @@ then
                        continue
                fi
 
-               # udev (>= 146) no longer provides vol_id
-               if [ -x /lib/udev/vol_id ]
-               then
-                       # lenny
-                       /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
-               else
-                       # squeeze
-                       /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
-               fi
+               /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
 
                magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
 

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 9554b77..871d8c0 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -51,32 +51,24 @@ udevadm settle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
-       parsed=$(echo "${STATICIP}" | sed -e 's/,/ /g')
+       parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
 
        for ifline in ${parsed}
        do
-               ifname="$(echo ${ifline} | cut -f1 -d ':')"
-               ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
-               ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
-               ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
+               ifname="$(echo ${ifline} | cut -f1 -d ',')"
+               ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
+               ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
+               ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
 
 cat >> "${IFFILE}" << EOF
-allow-hotplug ${ifname}
+auto ${ifname}
 iface ${ifname} inet static
     address ${ifaddress}
     netmask ${ifnetmask}
-EOF
-
-if [ -n "${ifgateway}" ]
-then
-
-cat >> "${IFFILE}" << EOF
     gateway ${ifgateway}
 
 EOF
 
-fi
-
        done
 else
        if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
@@ -98,7 +90,7 @@ else
                        i="$(basename ${interface})"
 
 cat >> "${IFFILE}" << EOF
-allow-hotplug ${i}
+auto ${i}
 iface ${i} inet ${method}
 
 EOF
@@ -146,7 +138,7 @@ fi
 #              grep -q "iface ${i}" ${IFFILE} && continue
 #
 #cat >> "${IFFILE}" << EOF
-#allow-hotplug ${i}
+#auto ${i}
 #iface ${i} inet dhcp
 #
 #EOF

diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
index 4ed1c6d..ef83c72 100755 (executable)
--- a/scripts/live-bottom/30accessibility
+++ b/scripts/live-bottom/30accessibility
@@ -66,17 +66,6 @@ remove_applet ()
        chroot /root update-gconf-defaults
 }
 
-add_sudoers_file ()
-{
-
-cat <<EOF > /root/etc/sudoers.d/a11y-sudo
-# TO allow accessibility in GTK to work with sudo.
-Defaults        env_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"
-EOF
-
-       chmod 0440 /root/etc/sudoers.d/a11y-sudo
-}
-
 case ${ACCESS} in
        access=v1)
                # Lesser Visual Impairment
@@ -101,7 +90,7 @@ case ${ACCESS} in
                gct -s -t string /desktop/gnome/applications/at/visual/exec orca
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-               add_sudoers_file
+               sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
                if [ -x /root/usr/bin/orca ]
                then
@@ -123,7 +112,7 @@ case ${ACCESS} in
                gct -s -t string /apps/empathy/conversation/theme classic
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
-               add_sudoers_file
+               sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
                remove_applet fast_user_switch
                if [ -x /root/usr/bin/orca ]
@@ -141,7 +130,7 @@ case ${ACCESS} in
                gct -s -t bool /apps/gksu/disable-grab true
                gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity
                gct -s -t string /apps/empathy/conversation/theme classic
-               add_sudoers_file
+               sed -i -e 's/# Host alias specification/Defaults\tenv_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"\n\n# Host alias specification/g' /root/etc/sudoers
 
                if [ -x /root/usr/bin/orca ]
                then

diff --git a/scripts/live-functions b/scripts/live-functions
index 5efe432..b1d7503 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -9,7 +9,13 @@ log_wait_msg ()
        then
                plymouth message --text="$@"
                plymouth watch-keystroke | read nunya
-       fi
+       elif [ -x /sbin/usplash_write ]
+       then
+               /sbin/usplash_write "INPUTENTER ${@}"
+               read nunya < /dev/.initramfs/usplash_outfifo
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "getstring ${@}" | read nunya
+       fi ; fi
 
        _log_msg "Waiting: ${@} ... \n"
 }

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 47674e6..2719eea 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -76,15 +76,7 @@ is_supported_fs ()
 
 get_fstype ()
 {
-       # udev (>= 146) no longer provides vol_id
-       if [ -x /lib/udev/vol_id ]
-       then
-               # lenny
-               /lib/udev/vol_id -t ${1} 2>/dev/null
-       else
-               # squeeze
-               /sbin/blkid -s TYPE -o value $1 2>/dev/null
-       fi
+       /sbin/blkid -s TYPE -o value $1 2>/dev/null
 }
 
 where_is_mounted ()
@@ -309,7 +301,7 @@ find_cow_device ()
                do
                        devname=$(sys2dev "${dev}")
 
-                       if echo "${black_listed_devices}" | grep -q -w "${devname}"
+                       if echo "${black_listed_devices}" | grep -q "${devname}"
                        then
                                # skip this device enterely
                                break
@@ -345,22 +337,10 @@ find_cow_device ()
                                done
                        fi
 
-                       # udev (>= 146) no longer provides vol_id
-                       if [ -x /lib/udev/vol_id ]
+                       if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
                        then
-                               # lenny
-                               if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
-                               then
-                                       echo "${devname}"
-                                       return 0
-                               fi
-                       else
-                               # squeeze
-                               if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
-                               then
-                                       echo "${devname}"
-                                       return 0
-                               fi
+                               echo "${devname}"
+                               return 0
                        fi
 
                        if [ "${PERSISTENT}" = "nofiles" ]
@@ -408,7 +388,7 @@ find_files ()
                        devname=$(sys2dev "${dev}")
                        devfstype="$(get_fstype ${devname})"
 
-                       if echo "${black_listed_devices}" | grep -q -w "${devname}"
+                       if echo "${black_listed_devices}" | grep -q "${devname}"
                        then
                                # skip this device enterely
                                break