install:
# Installing executables
- mkdir -p $(DESTDIR)/bin
- cp bin/live-system $(DESTDIR)/bin
-
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
uninstall:
# Uninstalling executables
- rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile $(DESTDIR)/bin/live-system $(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/*; \
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
# for reuse in another live-boot session.
# Look at the manpage for more informations.
#
-# Copyright (C) 2006-2011 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
. /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
{
echo "${PROGRAM}"
echo
- echo "Copyright (C) 2006-2011 Marco Amadori <marco.amadori@gmail.com>"
+ echo "Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>"
echo "Copyright (C) 2008 Chris Lamb <chris@chris-lamb.co.uk>"
echo
echo "This program is free software; you can redistribute it and/or modify"
echo "it under the terms of the GNU General Public License as published by"
- echo "the Free Software Foundation; either version 3 of the License, or"
+ echo "the Free Software Foundation; either version 2 of the License, or"
echo "(at your option) any later version."
echo
echo "This program is distributed in the hope that it will be useful,"
echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
echo
echo "On Debian systems, the complete text of the GNU General Public License"
- echo "can be found in /usr/share/common-licenses/GPL-3 file."
+ echo "can be found in /usr/share/common-licenses/GPL-2 file."
echo
echo "Homepage: <http://debian-live.alioth.debian.org/>"
# 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}"
+++ /dev/null
-#!/bin/sh
-
-# Redirect stdout to stderr
-exec 1>&2
-
-case "${1}" in
- -h|--help|-u|--usage)
- echo "live-system - determine if running system is a live system"
- echo
- echo "Usage: ${0} [-v|--verbose]"
-
- exit 2
- ;;
-
- -v|--verbose)
- _VERBOSE="true"
- ;;
-esac
-
-[ "${_VERBOSE}" ] && echo -n "Checking for live-system... "
-
-if [ ! -e /proc/cmdline ]
-then
- echo "E: /proc/cmdline - No such file."
- exit 2
-fi
-
-if grep -qs boot=live /proc/cmdline
-then
- [ "${_VERBOSE}" ] && echo -n " yes, this is a live system"
-
- if [ -d /live/image/install ]
- then
- if ls /live/image/install/pool/main/l/live-installer/live-installer_*.udeb > /dev/null 2>&1
- then
- [ "${_VERBOSE}" ] && echo " with live-installer support."
- else
- [ "${_VERBOSE}" ] && echo " without live-installer support."
- fi
- else
- [ "${_VERBOSE}" ] && echo "without installer support."
- fi
-
- exit 0
-else
- [ "${_VERBOSE}" ] && echo " no, this is not a live system."
-
- exit 1
-fi
+++ /dev/null
-#!/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
-live-boot (2.0.15-1) unstable; urgency=low
+live-boot (3.0~a1-1) experimental; urgency=low
- [ Daniel Baumann ]
- * Adding live-system script from live-tools.
- * Updating year in copyright.
-
- [ Marco Amadori ]
- * Adjust copyright entry in live-snapshot.
-
- -- Daniel Baumann <daniel@debian.org> Tue, 01 Feb 2011 22:49:03 +0100
-
-live-boot (2.0.14-1) unstable; urgency=low
-
- [ Steven Shiau ]
- * Removing the duplicated "the" in the live-boot.init script.
-
- [ Daniel Baumann ]
- * Correcting live hook to include mtdblock for syslinux memdisk usage,
- thanks to Michael Prokop <mika@grml.org>.
- * Supporting /dev/mtdblock0 as valid device name (for memdisk boot),
- thanks to Michael Prokop <mika@grml.org>.
-
- -- Daniel Baumann <daniel@debian.org> Fri, 24 Dec 2010 18:51:57 +0100
-
-live-boot (2.0.13-1) unstable; urgency=medium
-
- [ Ronny Standtke ]
- * Remounting cow read-only before prompting user to remove usb flash
- drive.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 06 Dec 2010 11:18:32 +0100
-
-live-boot (2.0.12-1) unstable; urgency=medium
-
- [ T(A)ILS developers ]
- * Fixing fromiso= on Squeeze.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 22 Nov 2010 23:27:01 +0100
-
-live-boot (2.0.11-1) unstable; urgency=medium
-
- * Removing deep link to bug page in the manual, since we don't have
- stable references yet.
-
- -- Daniel Baumann <daniel@debian.org> Thu, 28 Oct 2010 09:22:02 +0200
-
-live-boot (2.0.10-1) unstable; urgency=medium
-
- * Don't do anything in initscript when using toram (Closes: #601575).
-
- -- Daniel Baumann <daniel@debian.org> Wed, 27 Oct 2010 14:54:58 +0200
-
-live-boot (2.0.9-1) unstable; urgency=low
-
- [ T(A)ILS developers ]
- * Fixing overzealous blacklist usage.
- * Adding documentation for persistent=cryptsetup in the manpage.
-
- -- Daniel Baumann <daniel@debian.org> Tue, 26 Oct 2010 09:15:54 +0200
-
-live-boot (2.0.8-1) unstable; urgency=medium
-
- [ amnesia ]
- * Adding live-snapshot.list documentation to manpage.
-
- -- Daniel Baumann <daniel@debian.org> Tue, 12 Oct 2010 11:20:12 +0200
-
-live-boot (2.0.7-1) unstable; urgency=medium
-
- [ Michal Suchanek ]
- * Adding initial support for unionmount.
-
- [ Marco Amadori ]
- * Included a note about persistent-subtext (Helps: #536728).
-
- [ Daniel Baumann ]
- * Running manpage rebuild after manpage updates.
-
- -- Daniel Baumann <daniel@debian.org> Sat, 02 Oct 2010 10:06:41 +0200
-
-live-boot (2.0.6-1) unstable; urgency=medium
-
- [ intrigeri ]
- * Fixing find_snap to take its second argument into account.
-
- -- Daniel Baumann <daniel@debian.org> Sat, 25 Sep 2010 22:48:35 +0200
-
-live-boot (2.0.5-1) unstable; urgency=low
-
- [ Marco Amadori ]
- * Fix snapshots' sync-strings usage (Closes: #591330).
- * Fixed some snapshot related debug messages.
- * Added support for empty (initial) snapshots.
-
- [ Daniel Baumann ]
- * Adding patch from Colin Watson <cjwatson@ubuntu.com> to follow
- symlinks when checking for dynamically linked files at reboot in
- initscript.
-
- -- Daniel Baumann <daniel@debian.org> Tue, 14 Sep 2010 08:55:02 +0200
-
-live-boot (2.0.4-1) unstable; urgency=low
-
- [ Daniel Baumann ]
- * Applying patch from Luke Yelavich <themuso@ubuntu.com> to instead of
- mangling the main sudoers file in accessibility bottom script,
- create a new file in /etc/sudoers.d and set permissions
- appropriately.
- * Applying patch from Michael Casadevall <mcasadevall@ubuntu.com> to
- add platform-sata_mv to is_nice_device() to allow Marvell Dove A0
- and AVD1 to properly boot live media.
- * Updating uinstall targets in makefile.
-
- [ Steven Shiau ]
- * Allowing to assign no gateway in networking bottom script.
-
- [ Daniel Baumann ]
- * Removing usplash support from initscript, usplash is dead.
- * Removing usplash support in initramfs, usplash is dead.
- * Adding plymouth in bug script.
-
- -- Daniel Baumann <daniel@debian.org> Mon, 06 Sep 2010 15:21:24 +0200
-
-live-boot (2.0.3-1) unstable; urgency=low
-
- * Exiting with 0 in live-boot bug script (Closes: #595262).
- * Using boot.d instead of boot.conf.d as directory name for custom
- configuration files.
-
- -- Daniel Baumann <daniel@debian.org> Thu, 02 Sep 2010 22:43:03 +0200
-
-live-boot (2.0.2-1) unstable; urgency=low
-
- * Updating seperators in networking bottom script to fix ip parameter
- parsing (Closes: #590494).
- * Updating live-build reference in manpages.
- * Checking for file existence in initramfs hook (Closes: #595264).
- * Adding live-toram script to copy the running live system to ram and
- eject the live media.
-
- -- Daniel Baumann <daniel@debian.org> Thu, 02 Sep 2010 18:25:12 +0200
-
-live-boot (2.0.1-1) unstable; urgency=low
-
- [ Michael Prokop ]
- * Adding workaround for aufs issue in kernel versions around 2.6.33.
-
- [ Daniel Baumann ]
- * Using allow-hotplug instead of auto in automatically created
- /etc/network/interfaces file.
+ * Switching to source format 3.0 (quilt).
+ * Removing live-initramfs transitional package.
+ * Removing lenny support.
- -- Daniel Baumann <daniel@debian.org> Wed, 01 Sep 2010 18:25:08 +0200
+ -- Daniel Baumann <daniel@debian.org> Tue, 10 Aug 2010 02:02:39 +0200
live-boot (2.0.0-1) unstable; urgency=low
Architecture: all
Depends:
${misc:Depends}, busybox | busybox-initramfs, initramfs-tools, udev
-Conflicts: live-boot-backend, live-initramfs (<< 2.0~a1)
-Replaces: live-boot-backend, live-initramfs
+Conflicts: live-boot-backend
+Replaces: live-boot-backend
Provides: live-boot-backend
Description: Debian Live - System Boot Scripts (initramfs-tools backend)
live-boot contains the scripts that configure a Debian Live system during the
boot process (early userspace).
.
This package contains the initramfs-tools backend.
-
-Package: live-initramfs
-Architecture: all
-Depends:
- ${misc:Depends}, live-boot, live-boot-initramfs-tools, live-config,
- live-config-sysvinit
-Description: Debian Live - System Boot Scripts (transitional package)
- Package to ease upgrading from older live-initramfs packages to the new
- live-boot-initramfs-tools package.
- .
- This package can be purged at anytime once the live-boot-initramfs-tools
- package has been installed.
Files: *
Copyright:
- (C) 2007-2011 Daniel Baumann <daniel@debian.org>
+ (C) 2007-2010 Daniel Baumann <daniel@debian.org>
(C) 2005-2008 Canonical Ltd. <http://www.cannonical.com/>
(C) 2008 Chris Lamb <chris@debian.org>
(C) 2006-2007 Marco Amadori <marco.amadori@gmail.com>
Before submitting a bug report against live-boot, please make sure
that you have read our guidlines for Debian Live bug reports:
- http://live.debian.net/manual/
+ http://live.debian.net/manual/html/bugs.html
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
dpkg -l loop-aes-utils curlftpfs genext2fs httpfs2 squashfs-tools mtd-tools
# Checking other packages
-dpkg -l cryptsetup plymouth
-
-exit 0
+dpkg -l cryptsetup splashy usplash
NAME=live-boot
SCRIPTNAME=/etc/init.d/${NAME}
DO_SNAPSHOT=/sbin/live-snapshot
-SNAPSHOT_CONF="/etc/live/boot.d/snapshot.conf"
# Exit if system was not booted by live-boot
grep -qs boot=live /proc/cmdline || exit 0
-# Read snapshot configuration variables
-[ -r ${SNAPSHOT_CONF} ] && . ${SNAPSHOT_CONF}
+# Read configuration variable file if it is present
+[ -r /etc/live.conf ] && . /etc/live.conf
# Load the VERBOSE setting and other rcS variables
[ -f /etc/default/rcS ] && . /etc/default/rcS
then
if [ -x "${path}" ]
then
- if file -L "${path}" | grep -q 'dynamically linked'
+ if file "${path}" | grep -q 'dynamically linked'
then
for lib in $(ldd "${path}" | awk '{ print $3 }')
do
{
if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
then
- # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
if [ ! -z "${ROOTSNAP}" ]
then
${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
return 0
fi
- # check for toram
- if grep -qs toram /proc/cmdline
- then
- return 0
- fi
-
# Don't prompt to eject the SD card on Babbage board, where we reuse it
# as a quasi-boot-floppy. Technically this uses a bit of ubiquity
# (archdetect), but since this is mostly only relevant for
prompt=
fi
- for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth
+ for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty) /bin/plymouth /sbin/usplash_write
do
cache_path "${path}"
done
esac
done
- mount -o remount,ro /live/cow
-
if [ -z ${QUICKREBOOT} ]
then
MESSAGE="Please remove the USB flash drive"
else
# ejecting is a very good idea here
- MESSAGE="Please remove the disc, close the tray (if any)"
+ MESSAGE="Please remove the disc, close the the tray (if any)"
if [ -x /usr/bin/eject ]
then
printf "\n\n${MESSAGE} and press ENTER to continue:" > /dev/console
+ if [ -x /sbin/usplash_write ]
+ then
+ /sbin/usplash_write "TIMEOUT 86400"
+ /sbin/usplash_write "TEXT-URGENT ${MESSAGE}"
+ /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+ fi
+
read x < /dev/console
fi
fi
[ "${VERBOSE}" != no ] && log_end_msg 1
;;
esac
+
+ mount -o remount,ro /live/cow
;;
*)
. /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
# 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
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
# 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
#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
.\" 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
.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
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.
.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
.\" 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
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
-.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
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.
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
.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>.
-.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
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>.
#
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"
#. 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
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
#. 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
"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 "
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 "
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 "
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 "
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 "
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."
#. 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 \"/"
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. "
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 "
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 "
"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 "
"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."
#
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"
#. 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
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 \"/"
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. "
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 "
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 "
"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 "
"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."
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)"
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
#. 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
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
#. type: IP
#: en/live-boot.7:103
#, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<persistent>[=nofiles]"
msgstr ""
#. type: Plain text
"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 "
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 "
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 "
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 "
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 "
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."
#. 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 \"/"
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. "
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 "
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 "
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 "
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."
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
#. 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
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 \"/"
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. "
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 "
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 "
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 "
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."
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 ""
{
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]$'
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
if [ -b "${fromdev}" ]
then
- log_success_msg "Copying snapshot ${fromdev} to ${todir}..."
-
# look for free mem
if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]
then
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
}
{
# 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}"
}
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
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
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}" ]
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
}
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
cow_mountopt="rw,noatime,mode=755"
fi
- if [ "${UNIONTYPE}" != "unionmount" ]
- then
-
if [ "${cow_fstype}" = "nfs" ]
then
log_begin_msg \
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)
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}"
;;
# 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}" ]
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}"
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}"
fi
}
+start_usplash_pulse ()
+{
+ if [ -x /sbin/usplash_write ]
+ then
+ /sbin/usplash_write "PULSELOGO"
+ fi
+}
+
mountroot ()
{
if [ -x /scripts/local-top/cryptroot ]; then
Arguments
+ set_usplash_timeout
+ start_usplash_pulse
+
maybe_break live-premount
log_begin_msg "Running /scripts/live-premount"
run_scripts /scripts/live-premount
# 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
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"
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
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}" ]
i="$(basename ${interface})"
cat >> "${IFFILE}" << EOF
-allow-hotplug ${i}
+auto ${i}
iface ${i} inet ${method}
EOF
# grep -q "iface ${i}" ${IFFILE} && continue
#
#cat >> "${IFFILE}" << EOF
-#allow-hotplug ${i}
+#auto ${i}
#iface ${i} inet dhcp
#
#EOF
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
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
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 ]
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
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"
}
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 ()
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
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" ]
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
projects / live-boot-grml.git / commitdiff