SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
-all: test build
+all: build
test:
@echo -n "Checking for syntax errors"
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
uninstall:
# Uninstalling executables
- rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile $(DESTDIR)/sbin/live-toram
+ rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
rm -rf $(DESTDIR)/usr/share/live-boot
# 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-2011 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
{
echo "${PROGRAM}"
echo
- echo "Copyright (C) 2006 Marco Amadori <marco.amadori@gmail.com>"
+ echo "Copyright (C) 2006-2011 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 2 of the License, or"
+ echo "the Free Software Foundation; either version 3 of the License, or"
echo "(at your option) any later version."
echo
echo "This program is distributed in the hope that it will be useful,"
echo "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-2 file."
+ echo "can be found in /usr/share/common-licenses/GPL-3 file."
echo
echo "Homepage: <http://debian-live.alioth.debian.org/>"
+live-boot (3.0~a16-1) unstable; urgency=low
+
+ * Adding old 2.x changelog entries in debian changelog.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 14 Mar 2011 06:27:17 +0100
+
+live-boot (3.0~a15-1) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Updating year in copyright.
+
+ [ Marco Amadori ]
+ * Adjust copyright entry in live-snapshot.
+ * Protect NOPROMPT (Closes: #610941).
+
+ [ Michal Suchanek ]
+ * Simplify union mounting.
+ * Really set limit on open files for unionfs-fuse
+ * Add verbose messages to initramfs hook.
+
+ [ T(A)ILS developers ]
+ * Fixing remaining fromiso= bug.
+ * Fixing syntax error.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 09 Mar 2011 18:01:07 +0100
+
+live-boot (3.0~a14-1) experimental; urgency=low
+
+ [ Richard Nelson ]
+ * Populate adapters in /etc/network/interfaces when ethdevice= on
+ cmdline.
+
+ [ Daniel Baumann ]
+ * Removing header in copyright file.
+ * Don't hard-depend on test target in Makefile.
+ * Using dh auto magic in override, rather than manual make call.
+
+ [ Steven Shiau ]
+ * Removing the duplicated "the" in the live-boot.init script.
+
+ [ Daniel Baumann ]
+ * Updating auto_install overrides in rules.
+ * 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> Tue, 11 Jan 2011 13:38:56 +0100
+
+live-boot (3.0~a13-1) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing legacy code for detecting removable usb sticks on kernels
+ prior 2.6.29.
+ * Logging to /var/log/live-boot.log instead of /var/log/live.log for
+ future consistency with live-config.
+ * Adding support for custom ramdisk size (Closes: #544583).
+
+ [ Ronny Standtke ]
+ * Remounting cow read-only before prompting user to remove usb flash
+ drive.
+
+ [ Richard Nelson ]
+ * Clean some leading whitespaces.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 06 Dec 2010 11:27:07 +0100
+
+live-boot (3.0~a12-1) experimental; urgency=low
+
+ [ T(A)ILS developers ]
+ * Fixing fromiso= on Squeeze.
+
+ [ Daniel Baumann ]
+ * Adding dpkg source options file.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 22 Nov 2010 23:29:48 +0100
+
+live-boot (3.0~a11-1) experimental; urgency=low
+
+ [ T(A)ILS developers ]
+ * Adding noprompt={usb,cd} feature.
+ * Enhancing devices search ordering.
+
+ [ Daniel Baumann ]
+ * 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:28:43 +0200
+
+live-boot (3.0~a10-1) experimental; urgency=low
+
+ * Don't do anything in initscript when using toram (Closes: #601575).
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 27 Oct 2010 14:58:03 +0200
+
+live-boot (3.0~a9-1) experimental; urgency=low
+
+ [ amnesia ]
+ * Adding live-snapshot.list documentation to manpage.
+
+ [ Richard Nelson ]
+ * Removed whitespace for tabs on the skipunion option.
+
+ [ 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:24:51 +0200
+
+live-boot (3.0~a8-1) experimental; urgency=low
+
+ [ 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.
+ * Updating to debhelper version 8.
+
+ -- Daniel Baumann <daniel@debian.org> Sat, 02 Oct 2010 10:15:03 +0200
+
+live-boot (3.0~a7-1) experimental; urgency=low
+
+ [ intrigeri ]
+ * Fixing find_snap to take its second argument into account.
+
+ -- Daniel Baumann <daniel@debian.org> Sat, 25 Sep 2010 22:46:54 +0200
+
+live-boot (3.0~a6-1) experimental; 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:51:59 +0200
+
+live-boot (3.0~a5-1) experimental; 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 lenny legacy stuff from initscript.
+ * Removing usplash support in initramfs, usplash is dead.
+ * Adding plymouth in bug script.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 06 Sep 2010 15:17:15 +0200
+
+live-boot (3.0~a4-1) experimental; 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:46:45 +0200
+
+live-boot (3.0~a3-1) experimental; urgency=low
+
+ * Updating seperators in networking bottom script to fix ip parameter
+ parsing (Closes: #590494).
+ * Updating live-build reference in manpages.
+ * Adding reference to live-tools in manpages.
+ * Checking for file existence in initramfs hook (Closes: #595264).
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 02 Sep 2010 18:28:40 +0200
+
+live-boot (3.0~a2-1) experimental; urgency=low
+
+ [ Daniel Baumann ]
+ * Removing old and unmaintained po files.
+ * Adding reformated patch from Stephan Hermann <sh@sourcecode.de>
+ based on the work of Holger Fischer <hoo.mb@web.de> to add support
+ for BOOTIF in cases where pxelinux is being used with IPAPPEND
+ (Closes: #593284).
+
+ [ Steven Shiau ]
+ * Making multiple connected NICs work.
+
+ [ 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.
+
+ -- Daniel Baumann <daniel@debian.org> Wed, 01 Sep 2010 18:27:33 +0200
+
+live-boot (3.0~a1-1) experimental; urgency=low
+
+ * Switching to source format 3.0 (quilt).
+ * Removing live-initramfs transitional package.
+ * Removing lenny support.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 10 Aug 2010 02:02:39 +0200
+
+live-boot (2.0.15-1) unstable; 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 ]
Priority: optional
Maintainer: Debian Live Project <debian-live@lists.debian.org>
Uploaders: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 8)
Standards-Version: 3.9.1
Homepage: http://live.debian.net/devel/live-boot/
Vcs-Browser: http://live.debian.net/gitweb/?p=live-boot.git
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.
-Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
-Upstream-Homepage: http://live.debian.net/
-
Files: *
Copyright:
- (C) 2007-2010 Daniel Baumann <daniel@debian.org>
+ (C) 2007-2011 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>
[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
# check that the device is an USB device
- if readlink /sys/block/${DEVICE} | grep -q usb ||
- readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
+ if readlink /sys/block/${DEVICE} | grep -q usb
then
return 0
fi
fi
prompt=1
- if grep -qs noprompt /proc/cmdline
+ if [ "${NOPROMPT}" = "Yes" ]
then
prompt=
fi
esac
done
+ mount -o remount,ro /live/cow
+
if [ -z ${QUICKREBOOT} ]
then
# failes because they actually remember the
# "ejected" state even after reboot
MESSAGE="Please remove the USB flash drive"
+
+ if [ "${NOPROMPT}" = "usb" ]
+ then
+ prompt=
+ fi
+
else
# ejecting is a very good idea here
- MESSAGE="Please remove the disc, close the the tray (if any)"
+ MESSAGE="Please remove the disc, close the tray (if any)"
if [ -x /usr/bin/eject ]
then
eject -p -m /live/image >/dev/null 2>&1
fi
+ if [ ${NOPROMPT} = "cd" ]
+ then
+ prompt=
+ fi
+
fi
[ "$prompt" ] || return 0
[ "${VERBOSE}" != no ] && log_end_msg 1
;;
esac
-
- mount -o remount,ro /live/cow
;;
*)
%:
dh ${@}
-override_dh_auto_build:
- # disabled
-
override_dh_auto_install:
- $(MAKE) DESTDIR=$(CURDIR)/debian/live-boot install
-
- mkdir -p debian/live-boot-initramfs-tools/usr/share
- mv debian/live-boot/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
+ dh_auto_install -- DESTDIR=debian/live-boot
# Removing useless files
rm -f debian/live-boot/usr/share/doc/live-boot/COPYING
+ # live-boot-initramfs-tools
+ mkdir -p debian/live-boot-initramfs-tools/usr/share
+ mv debian/live-boot/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
+
override_dh_installinit:
dh_installinit -p live-boot --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'
--- /dev/null
+compression = gzip
+compression-level = 9
. /usr/share/initramfs-tools/hook-functions
+[ "${QUIET}" ] || echo -n live-boot:
+
# live-boot hook
# Reading configuration file from filesystem
# Handling live-boot
+[ "${QUIET}" ] || echo -n " "core
# Configuration
if [ -e /usr/share/live-boot/languagelist ]
then
# Handling other stuff
+[ "${QUIET}" ] || echo -n " "filesystems
# Configuration: keymap (usefull when using encryption)
if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
then
# Filesystem: ntfs
manual_add_modules ntfs
+[ "${QUIET}" ] || echo -n " "devices
# Hardware: cdrom
manual_add_modules ide-cd
manual_add_modules ide-generic
copy_exec /usr/bin/eject /bin
fi
+[ "${QUIET}" ] || echo -n " "utils
# Program: md5sum
copy_exec /usr/bin/md5sum /bin
# Program: memdisk
if [ -x /usr/bin/memdiskfind ]
then
+[ "${QUIET}" ] || echo -n :memdisk
copy_exec /usr/bin/memdiskfind
- manual_add_modules phram mtdblock
+ manual_add_modules phram
+ manual_add_modules mtdblock
fi
# Program: cpio
# Program: udev
if [ -x /sbin/udevadm ]
then
- # lenny
+ [ "${QUIET}" ] || echo -n " "udev
copy_exec /sbin/udevadm /sbin
-else
- # etch
- copy_exec /sbin/udevtrigger /sbin
- copy_exec /sbin/udevsettle /sbin
fi
if [ -x /usr/bin/udevinfo ]
then
+ [ "${QUIET}" ] || echo -n " "udev
copy_exec /usr/bin/udevinfo /bin
fi
# Program: wget
if [ -x /usr/bin/wget ]
then
+ [ "${QUIET}" ] || echo -n " "wget
copy_exec /usr/bin/wget /bin
fi
# Program: blockdev
if [ -x /sbin/blockdev ]
then
+ [ "${QUIET}" ] || echo -n " "blockdev
copy_exec /sbin/blockdev /sbin
fi
# FUSE filesystem: httpfs2
if [ -x /usr/bin/httpfs2_ssl ]
then
+ [ "${QUIET}" ] || echo -n " "httpfs:ssl
copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
elif [ -x /usr/bin/httpfs2 ]
then
+ [ "${QUIET}" ] || echo -n " "httpfs
copy_exec /usr/bin/httpfs2 /bin/httpfs
fi
# FUSE filesystem: curlftpfs
if [ -x /usr/bin/curlftpfs ]
then
+ [ "${QUIET}" ] || echo -n " "ftpfs
copy_exec /usr/bin/curlftpfs /bin
fi
# iSCSI
if [ -x /usr/sbin/iscsistart ]
then
- copy_exec /usr/sbin/iscsistart /bin
- #manual_add_modules ib_iser
- manual_add_modules iscsi_tcp
- manual_add_modules crc32c
+ [ "${QUIET}" ] || echo -n " "iscsi
+ copy_exec /usr/sbin/iscsistart /bin
+ #manual_add_modules ib_iser
+ manual_add_modules iscsi_tcp
+ manual_add_modules crc32c
fi
if [ "${LIVE_DNS}" = "true" ]
then
+ [ "${QUIET}" ] || echo -n " "dns
#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd
copy_exec /lib/libnss_dns.so.* /lib # DNS server
#copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd
if [ "${LIVE_UNIONMOUNT}" = "true" ]
then
+ [ "${QUIET}" ] || echo -n " "unionmount
# UnionMount
# only mount from patched util-linux can do this currently
copy_exec /bin/mount /bin/mount_full
fi
+
+[ "${QUIET}" ] || echo .
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 22.11.2010 2.0.12 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2011\-03\-14 3.0~a16 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
has been installed with persistent enabled.
.IP \fBnoprompt\fP 4
Do not prompt to eject the CD or remove the USB flash drive on reboot.
+.IP \fBnoprompt\fP=\fITYPE\fP 4
+This tells live\-boot not to prompt to eject the CD (when noprompt=cd) or
+remove the USB flash drive (when noprompt=usb) on reboot.
+.IP \fBramdisk\-size\fP 4
+This parameters allows to set a custom ramdisk size (it's the '\-o size'
+option of tmpfs mount). By default, there is no ramdisk size set, so the
+default of mount applies (currently 50% of available RAM). Note that this
+option has no currently no effect when booting with toram.
.IP \fBswapon\fP 4
This parameter enables usage of local swap partitions.
.IP \fBpersistent\fP[={nofiles|cryptsetup}] 4
\fIlive\-build\fP(7)
.PP
\fIlive\-config\fP(7)
+.PP
+\fIlive\-tools\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 22.11.2010 2.0.12 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 2011\-03\-14 3.0~a16 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
\fIlive\-build\fP(7)
.PP
\fIlive\-config\fP(7)
+.PP
+\fIlive\-tools\fP(7)
.SH HOMEPAGE
Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen
-.TH LIVE\-BOOT 7 2010\-11\-22 2.0.12 "Debian Live Project"
+.TH LIVE\-BOOT 7 2011\-03\-14 3.0~a16 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
.IP "\fBnoprompt\fR" 4
Do not prompt to eject the CD or remove the USB flash drive on reboot.
+.IP "\fBnoprompt\fR=\fITYPE\fR" 4
+This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove the USB flash drive (when noprompt=usb) on reboot.
+.IP "\fBramdisk\-size\fR" 4
+This parameters allows to set a custom ramdisk size (it's the '\-o size' option of tmpfs mount). By default, there is no ramdisk size set, so the default of mount applies (currently 50% of available RAM). Note that this option has no currently no effect when booting with toram.
.IP "\fBswapon\fR" 4
This parameter enables usage of local swap partitions.
.IP "\fBpersistent\fR[={nofiles|cryptsetup}]" 4
\fIlive\-build\fR(7)
.PP
\fIlive\-config\fR(7)
+.PP
+\fIlive\-tools\fR(7)
.SH HOMEPAGE
More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
-.TH LIVE\-BOOT 1 2010\-11\-22 2.0.12 "Debian Live Project"
+.TH LIVE\-BOOT 1 2011\-03\-14 3.0~a16 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
\fIlive\-build\fR(7)
.PP
\fIlive\-config\fR(7)
+.PP
+\fIlive\-tools\fR(7)
.SH HOMEPAGE
More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 2.0.12\n"
-"POT-Creation-Date: 2010-11-22 23:27+0100\n"
+"Project-Id-Version: live-boot 3.0~a16\n"
+"POT-Creation-Date: 2011-03-14 06:27+0100\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 "2010-11-22"
-msgstr "22.11.2010"
+msgid "2011-03-14"
+msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "2.0.12"
-msgstr "2.0.12"
+msgid "3.0~a16"
+msgstr "3.0~a16"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#. type: IP
#: en/live-boot.7:101
#, no-wrap
+msgid "B<noprompt>=I<TYPE>"
+msgstr "B<noprompt>=I<TYPE>"
+
+#. type: Plain text
+#: en/live-boot.7:103
+msgid ""
+"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
+"remove the USB flash drive (when noprompt=usb) on reboot."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:103
+#, no-wrap
+msgid "B<ramdisk-size>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:105
+msgid ""
+"This parameters allows to set a custom ramdisk size (it's the '-o size' "
+"option of tmpfs mount). By default, there is no ramdisk size set, so the "
+"default of mount applies (currently 50% of available RAM). Note that this "
+"option has no currently no effect when booting with toram."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:105
+#, no-wrap
msgid "B<swapon>"
msgstr "B<swapon>"
#. type: Plain text
-#: en/live-boot.7:103
+#: en/live-boot.7:107
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:107
#, no-wrap
msgid "B<persistent>[={nofiles|cryptsetup}]"
-msgstr "B<persistent>[={nofiles|cryptsetup}]"
+msgstr ""
#. type: Plain text
-#: en/live-boot.7:105
+#: en/live-boot.7:109
msgid ""
"live-boot will look for persistent and snapshot partitions or files labeled "
"\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and "
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:111
msgid ""
"If \"nofiles\" is specified, only filesystems with matching labels will be "
"searched; no filesystems will be traversed looking for archives or image "
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:113
msgid ""
"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
"will be considered as well as others when searching for a persistence "
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:113
#, 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:115
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
+#: en/live-boot.7:115
#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr "B<persistent-subtext>=I<SUFFIX>"
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:117
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 "
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:117
#, 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:119
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:119
#, 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:121
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:121
#, no-wrap
msgid "B<quickreboot>"
msgstr "B<quickreboot>"
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:123
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:123
#, no-wrap
msgid "B<showmounts>"
msgstr "B<showmounts>"
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:125
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:125
#, no-wrap
msgid "B<silent>"
msgstr "B<silent>"
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:127
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:127
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr "B<todisk>=I<DEVICE>"
#. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:129
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:129
#, no-wrap
msgid "B<toram>"
msgstr "B<toram>"
#. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:131
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:131
#, 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:134
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:136
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:137 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:139 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:139 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:141 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:141 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:143 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:146 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:147 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr "DATEIEN"
#. type: IP
-#: en/live-boot.7:144
+#: en/live-boot.7:148
#, 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:149
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr "B</etc/live/boot.d/>"
#. type: IP
-#: en/live-boot.7:146
+#: en/live-boot.7:150
#, no-wrap
msgid "B<live/boot.conf>"
msgstr "B<live/boot.conf>"
#. type: IP
-#: en/live-boot.7:147
+#: en/live-boot.7:151
#, no-wrap
msgid "B<live/boot.d/>"
msgstr "B<live/boot.d/>"
#. type: SH
-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:151
+#: en/live-boot.7:155
msgid "I<live-snapshot>(1)"
msgstr "I<live-snapshot>(1)"
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:157 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:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
+#. type: Plain text
+#: en/live-boot.7:161 en/live-snapshot.1:62
+msgid "I<live-tools>(7)"
+msgstr "I<live-tools>(7)"
+
#. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:164 en/live-snapshot.1:65
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:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:167 en/live-snapshot.1:68
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:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:169 en/live-snapshot.1:70
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.12\n"
-"POT-Creation-Date: 2010-11-22 23:27+0100\n"
+"Project-Id-Version: live-boot 3.0~a16\n"
+"POT-Creation-Date: 2011-03-14 06:27+0100\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 "2010-11-22"
-msgstr "22.11.2010"
+msgid "2011-03-14"
+msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "2.0.12"
-msgstr "2.0.12"
+msgid "3.0~a16"
+msgstr "3.0~a16"
#. 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:137 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:139 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:139 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:141 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:141 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:143 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:146 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:147 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:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:157 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:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
+#. type: Plain text
+#: en/live-boot.7:161 en/live-snapshot.1:62
+msgid "I<live-tools>(7)"
+msgstr "I<live-tools>(7)"
+
#. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:164 en/live-snapshot.1:65
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:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:167 en/live-snapshot.1:68
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:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:169 en/live-snapshot.1:70
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: 2010-11-22 23:27+0100\n"
+"POT-Creation-Date: 2011-03-14 06:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-11-22"
+msgid "2011-03-14"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.12"
+msgid "3.0~a16"
msgstr ""
#. type: TH
#. type: IP
#: en/live-boot.7:101
#, no-wrap
-msgid "B<swapon>"
+msgid "B<noprompt>=I<TYPE>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:103
-msgid "This parameter enables usage of local swap partitions."
+msgid ""
+"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
+"remove the USB flash drive (when noprompt=usb) on reboot."
msgstr ""
#. type: IP
#: en/live-boot.7:103
#, no-wrap
-msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgid "B<ramdisk-size>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:105
msgid ""
+"This parameters allows to set a custom ramdisk size (it's the '-o size' "
+"option of tmpfs mount). By default, there is no ramdisk size set, so the "
+"default of mount applies (currently 50% of available RAM). Note that this "
+"option has no currently no effect when booting with toram."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:105
+#, no-wrap
+msgid "B<swapon>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:107
+msgid "This parameter enables usage of local swap partitions."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:107
+#, no-wrap
+msgid "B<persistent>[={nofiles|cryptsetup}]"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:109
+msgid ""
"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, "
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:111
msgid ""
"If \"nofiles\" is specified, only filesystems with matching labels will be "
"searched; no filesystems will be traversed looking for archives or image "
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:113
msgid ""
"If \"cryptsetup\" is specified, filesystems stored on Luks-encrypted devices "
"will be considered as well as others when searching for a persistence "
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:113
#, no-wrap
msgid "B<persistent-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:115
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
+#: en/live-boot.7:115
#, no-wrap
msgid "B<persistent-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:117
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 "
msgstr ""
#. type: IP
-#: en/live-boot.7:113
+#: en/live-boot.7:117
#, no-wrap
msgid "{B<preseed/file>|B<file>}=I<FILE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:115
+#: en/live-boot.7:119
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:119
#, no-wrap
msgid "B<package/question>=I<VALUE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:117
+#: en/live-boot.7:121
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:121
#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:119
+#: en/live-boot.7:123
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:123
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:121
+#: en/live-boot.7:125
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:125
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:123
+#: en/live-boot.7:127
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:127
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:125
+#: en/live-boot.7:129
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:129
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:127
+#: en/live-boot.7:131
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:131
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:130
+#: en/live-boot.7:134
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:136
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:137 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:139 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:139 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:141 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:141 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:143 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:146 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:147 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:144
+#: en/live-boot.7:148
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:145
+#: en/live-boot.7:149
#, no-wrap
msgid "B</etc/live/boot.d/>"
msgstr ""
#. type: IP
-#: en/live-boot.7:146
+#: en/live-boot.7:150
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:147
+#: en/live-boot.7:151
#, no-wrap
msgid "B<live/boot.d/>"
msgstr ""
#. type: SH
-#: en/live-boot.7:149 en/live-snapshot.1:54
+#: en/live-boot.7:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151
+#: en/live-boot.7:155
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:157 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
+#. type: Plain text
+#: en/live-boot.7:161 en/live-snapshot.1:62
+msgid "I<live-tools>(7)"
+msgstr ""
+
#. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:164 en/live-snapshot.1:65
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:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:167 en/live-snapshot.1:68
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:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:169 en/live-snapshot.1:70
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: 2010-11-22 23:27+0100\n"
+"POT-Creation-Date: 2011-03-14 06:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-11-22"
+msgid "2011-03-14"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.12"
+msgid "3.0~a16"
msgstr ""
#. type: TH
msgstr ""
#. type: IP
-#: en/live-boot.7:133 en/live-snapshot.1:43
+#: en/live-boot.7:137 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:139 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:139 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:141 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:141 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:143 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:146 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:147 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:153 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:153 en/live-snapshot.1:58
+#: en/live-boot.7:157 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:60
+#: en/live-boot.7:159 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
+#. type: Plain text
+#: en/live-boot.7:161 en/live-snapshot.1:62
+msgid "I<live-tools>(7)"
+msgstr ""
+
#. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:61
+#: en/live-boot.7:162 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:158 en/live-snapshot.1:63
+#: en/live-boot.7:164 en/live-snapshot.1:65
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:165 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:161 en/live-snapshot.1:66
+#: en/live-boot.7:167 en/live-snapshot.1:68
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:168 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:163 en/live-snapshot.1:68
+#: en/live-boot.7:169 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
"the Debian project."
export DEFCONSOLE
;;
+ BOOTIF=*)
+ BOOTIF="${x#BOOTIF=}"
+ ;;
+
debug)
DEBUG="Yes"
export DEBUG
;;
fetch=*)
- FETCH="${ARGUMENT#fetch=}"
- export FETCH
- ;;
+ FETCH="${ARGUMENT#fetch=}"
+ export FETCH
+ ;;
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
httpfs=*)
HTTPFS="${ARGUMENT#httpfs=}"
export HTTPFS
- ;;
+ ;;
iscsi=*)
ISCSI="${ARGUMENT#iscsi=}"
export NONETWORKING
;;
+ ramdisk-size=*)
+ ramdisk_size="${ARGUMENT#ramdisk-size=}"
+ ;;
+
swapon)
SWAPON="Yes"
export SWAPON
export NOPERSISTENT
;;
+ noprompt)
+ NOPROMPT="Yes"
+ export NOPROMPT
+ ;;
+
+ noprompt=*)
+ NOPROMPT="${ARGUMENT#noprompt=}"
+ export NOPROMPT
+ ;;
+
quickusbmodules)
QUICKUSBMODULES="Yes"
export QUICKUSBMODULES
;;
skipunion)
- SKIP_UNION_MOUNTS="Yes"
- export SKIP_UNION_MOUNTS
- ;;
+ SKIP_UNION_MOUNTS="Yes"
+ export SKIP_UNION_MOUNTS
+ ;;
root=*)
ROOT="${ARGUMENT#root=}"
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
return 1
fi
+ # Custom ramdisk size
+ if [ -z "${mount_options}" ] && [ -n "${ramdisk_size}" ]
+ then
+ # FIXME: should check for wrong values
+ mount_options="-o size=${ramdisk_size}"
+ fi
+
# begin copying (or uncompressing)
mkdir "${copyto}"
log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
udevadm trigger
udevadm settle
+ [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
+ echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
+
if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
[ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
then
+
+ # support for Syslinux IPAPPEND parameter
+ # it sets the BOOTIF variable on the kernel parameter
+
+ if [ -n "${BOOTIF}" ]
+ then
+ # pxelinux sets BOOTIF to a value based on the mac address of the
+ # network card used to PXE boot, so use this value for DEVICE rather
+ # than a hard-coded device name from initramfs.conf. this facilitates
+ # network booting when machines may have multiple network cards.
+ # pxelinux sets BOOTIF to 01-$mac_address
+
+ # strip off the leading "01-", which isn't part of the mac
+ # address
+ temp_mac=${BOOTIF#*-}
+
+ # convert to typical mac address format by replacing "-" with ":"
+ bootif_mac=""
+ IFS='-'
+ for x in $temp_mac
+ do
+ if [ -z "$bootif_mac" ]
+ then
+ bootif_mac="$x"
+ else
+ bootif_mac="$bootif_mac:$x"
+ fi
+ done
+ unset IFS
+
+ # look for devices with matching mac address, and set DEVICE to
+ # appropriate value if match is found.
+
+ for device in /sys/class/net/*
+ do
+ if [ -f "$device/address" ]
+ then
+ current_mac=$(cat "$device/address")
+
+ if [ "$bootif_mac" = "$current_mac" ]
+ then
+ DEVICE=${device##*/}
+ break
+ fi
+ fi
+ done
+ fi
+
# if ethdevice was not specified on the kernel command line
# make sure we try to get a working network configuration
# for *every* present network device (except for loopback of course)
devlist="$devlist $device"
done
- [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
- echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
-
# this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
# an endless loop; iff execution fails give it two further tries, that's
# why we use '$devlist $devlist $devlist' for the other for loop
done
else
- ipconfig ${DEVICE} | tee /netboot.config
- fi
-
- # source relevant ipconfig output
- OLDHOSTNAME=${HOSTNAME}
- . /tmp/net-${DEVICE}.conf
- [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
- export HOSTNAME
-
- if [ -n "${DEVICE}" ]
- then
- HWADDR="$(cat /sys/class/net/${DEVICE}/address)"
+ for interface in ${DEVICE}; do
+ ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
+ [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+ if [ "$IPV4ADDR" != "0.0.0.0" ]
+ then
+ break
+ fi
+ done
fi
- if [ ! -e "/etc/resolv.conf" ]
- then
- echo "Creating /etc/resolv.conf"
+ for interface in ${DEVICE}; do
+ # source relevant ipconfig output
+ OLDHOSTNAME=${HOSTNAME}
+ [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+ [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
+ export HOSTNAME
- if [ -n "${DNSDOMAIN}" ]
+ if [ -n "${interface}" ]
then
- echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
- echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+ HWADDR="$(cat /sys/class/net/${interface}/address)"
fi
- for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
- do
- echo "nameserver $i" >> /etc/resolv.conf
- done
- fi
+ if [ ! -e "/etc/resolv.conf" ]
+ then
+ echo "Creating /etc/resolv.conf"
- # Check if we have a network device at all
- if ! ls /sys/class/net/"$DEVICE" > /dev/null 2>&1 && \
- ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
- ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \
- ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \
- ! ls /sys/class/net/ra0 > /dev/null 2>&1
- then
- panic "No supported network device found, maybe a non-mainline driver is required."
- fi
+ if [ -n "${DNSDOMAIN}" ]
+ then
+ echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
+ echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+ fi
+
+ for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+ do
+ echo "nameserver $i" >> /etc/resolv.conf
+ done
+ fi
+
+ # Check if we have a network device at all
+ if ! ls /sys/class/net/"$interface" > /dev/null 2>&1 && \
+ ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
+ ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \
+ ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \
+ ! ls /sys/class/net/ra0 > /dev/null 2>&1
+ then
+ panic "No supported network device found, maybe a non-mainline driver is required."
+ fi
+ done
}
do_netmount()
[ "${DEBUG}" == "Yes" ] && debugopt="-d 8"
#FIXME this name is supposed to be unique - some date + ifconfig hash?
ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
- export ISCSI_INITIATORNAME
+ export ISCSI_INITIATORNAME
if [ -n "${ISCSI_SERVER}" ] ; then
iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}"
else
try_snap ()
{
- # copy the contents of previously found snapshot to ${snap_mount}
+ # copy the contents of previously found snapshot to ${snap_mount}
# and remember the device and filename for resync on exit in live-boot.init
snapdata="${1}"
{
image_directory="${1}"
rootmnt="${2}"
- addimage_directory="${3}"
+ addimage_directory="${3}"
case ${UNIONTYPE} in
aufs|unionfs)
croot="/"
# Let's just mount the read-only file systems first
- rofsstring=""
rofslist=""
if [ "${UNIONTYPE}" = "aufs" ]
image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
fi
- [ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
+ [ -n "${MODULETORAMFILE}" ] && image_string="${image_directory}/$(basename ${MODULETORAMFILE})"
mkdir -p "${croot}"
if [ -d "${image}" ]
then
# it is a plain directory: do nothing
- rofsstring="${image}=${roopt}:${rofsstring}"
rofslist="${image} ${rofslist}"
elif [ -f "${image}" ]
then
if [ "${UNIONTYPE}" != "unionmount" ]
then
mpoint="${croot}/${imagename}"
- rofsstring="${mpoint}=${roopt}:${rofsstring}" && rofslist="${mpoint} ${rofslist}"
+ rofslist="${mpoint} ${rofslist}"
else
mpoint="${rootmnt}"
+ rofslist="${rootmnt} ${rofslist}"
fi
mkdir -p "${mpoint}"
log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\""
# we have a plain root system
mkdir -p "${croot}/filesystem"
log_begin_msg "Mounting \"${image_directory}\" on \"${croot}/filesystem\""
- mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || panic "Can not mount ${image_directory} on ${croot}/filesystem" && rofsstring="${croot}/filesystem=${roopt}:${rofsstring}" && rofslist="${croot}/filesystem ${rofslist}"
+ mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || \
+ panic "Can not mount ${image_directory} on ${croot}/filesystem" && \
+ rofslist="${croot}/filesystem ${rofslist}"
# probably broken:
mount -o bind ${croot}/filesystem $mountpoint
log_end_msg
fi
- rofsstring=${rofsstring%:}
-
mkdir -p /cow
# Looking for "${root_persistence}" device or file
if [ "${UNIONTYPE}" != "unionmount" ]
then
- if [ "${cow_fstype}" = "nfs" ]
- then
- log_begin_msg \
- "Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
- nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
- panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
- else
- mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
- panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
- fi
+ if [ "${cow_fstype}" = "nfs" ]
+ then
+ log_begin_msg \
+ "Trying nfsmount ${nfs_cow_opts} ${cowdevice} /cow"
+ nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
+ panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
+ else
+ 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)
- if [ -n "${EXPOSED_ROOT}" ]
+ if [ ${rofscount} -ne 1 ]
then
- if [ ${rofscount} -ne 1 ]
- then
- panic "only one RO file system supported with exposedroot: ${rofslist}"
- fi
- exposedrootfs=${rofslist%% }
+ panic "only one RO file system supported with exposedroot: ${rofslist}"
+ fi
+ rofs=${rofslist%% }
- mount --bind ${exposedrootfs} ${rootmnt} || \
- panic "bind mount of ${exposedrootfs} failed"
+ if [ -n "${EXPOSED_ROOT}" ]
+ then
+ mount --bind ${rofs} ${rootmnt} || \
+ panic "bind mount of ${rofs} failed"
if [ -z "${SKIP_UNION_MOUNTS}" ]
then
else
cow_dirs=''
fi
+ else
+ cow_dirs="/"
+ fi
- for dir in ${cow_dirs}; do
- mkdir -p /cow${dir}
+ if [ "${cow_fstype}" != "tmpfs" ] && [ "${cow_dirs}" != "/" ] && [ "${UNIONTYPE}" = "unionmount" ]
+ then
+ true # FIXME: Maybe it does, I don't really know.
+ #panic "unionmount does not support subunions (${cow_dirs})."
+ fi
- case "${UNIONTYPE}" in
- unionfs-fuse)
- (ulimit -n 16384; unionfs-fuse -o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid /cow=RW:${exposedrootfs}${dir} "${rootmnt}${dir}" || panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option cow,noinitgroups,default_permissions,allow_other,use_ino,suid=/cow=RW:${exposedrootfs}${dir}")
- mkdir -p /dev/.initramfs/varrun
- pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
- ;;
+ unionmountopts=""
+ unionmountpoint=""
- *)
- mount -t ${UNIONTYPE} -o rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro ${UNIONTYPE} "${rootmnt}${dir}" || panic "mount ${UNIONTYPE} on ${rootmnt}${dir} failed with option rw,noatime,dirs=/cow${dir}=rw:${exposedrootfs}${dir}=ro"
- ;;
- esac
- done
- else
+ for dir in ${cow_dirs}; do
+ mkdir -p /cow${dir}
+
+ unionmountpoint="${rootmnt}${dir}"
+ unionrw="/cow${dir}"
+ unionro="${rofs}${dir}"
+ # We don't handle spaces and other junk gracefully here, hopefully not needed.
case "${UNIONTYPE}" in
unionfs-fuse)
- (ulimit -n 16384; unionfs-fuse -o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid /cow=RW:${rofsstring} "${rootmnt}" || panic "mount ${UNIONTYPE} on ${rootmnt} failed with option cow,noinitgroups,default_permissions,allow_other,use_ino,suid=/cow:RW:${rofsstring}")
- mkdir -p /dev/.initramfs/varrun
- pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true
+ unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid"
+ unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
+ ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
+ unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
+ ( mkdir -p /dev/.initramfs/varrun
+ 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}"
+ unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
+ mount_full $unionmountopts "${unionmountpoint}"
;;
+
*)
- 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}"
+ unionmountopts="-o noatime,${noxino_opt}dirs=${unionrw}=rw:${unionro}=${roopt}"
+ mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
;;
- esac
- fi
+ esac || \
+ panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}"
+ done
# Correct the permissions of /:
chmod 0755 "${rootmnt}"
if [ "$ISO_DEVICE" = "/" ]
then
- echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
+ echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
else
- mkdir /isofrom
- mount -t auto "$ISO_DEVICE" /isofrom
- ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
- loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
- devname="${loopdevname}"
+ fs_type=$(get_fstype "${ISO_DEVICE}")
+ if is_supported_fs ${fs_type}
+ then
+ mkdir /isofrom
+ mount -t $fs_type "$ISO_DEVICE" /isofrom
+ ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
+ loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+ devname="${loopdevname}"
+ else
+ echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
+ fi
fi
fi
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
- if readlink ${sysblock} | grep -q usb ||
- readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+ if readlink ${sysblock} | grep -q usb
then
for dev in $(subdevices "${sysblock}")
do
mountroot ()
{
- if [ -x /scripts/local-top/cryptroot ]; then
+ if [ -x /scripts/local-top/cryptroot ]; then
/scripts/local-top/cryptroot
fi
exec 6>&1
exec 7>&2
- exec > live.log
+ exec > live-boot.log
exec 2>&1
- tail -f live.log >&7 &
+ tail -f live-boot.log >&7 &
tailpid="${!}"
# Ensure 'panic' function is overridden
exec 1>&6 6>&-
exec 2>&7 7>&-
kill ${tailpid}
- [ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
+ [ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null
}
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
method="manual"
fi
- # iterate the physical interfaces and add them to the interfaces list
- if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
+ # iterate the physical interfaces and add them to the interfaces list and also add when ethdevice= called on cmdline
+ if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ]) || [ ! -z "${ETHDEVICE}" ]
then
for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
do
DEB_3="\033[1;31m\`. \`'\` \033[0m"
DEB_4="\033[1;31m \`- \033[0m"
- LIVELOG="\033[1;37m/live.log\033[0m"
+ LIVELOG="\033[1;37m/live-boot.log\033[0m"
DEBUG="\033[1;37mdebug\033[0m"
# Reset redirections to avoid buffering
sysblock=${1}
r=""
- for dev in "${sysblock}" "${sysblock}"/*
+ for dev in "${sysblock}"/* "${sysblock}"
do
if [ -e "${dev}/dev" ]
then
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 ()
fstype=$(get_fstype "${dev}")
fi
mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
- ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
+ ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live-boot.log && return 0 )
fi
}
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
+ fulldevname=$(sys2dev "${sysblock}")
+
+ if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
- # skip this device enterely
+ # skip this subdevice
break
fi
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" ]
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
+ fulldevname=$(sys2dev "${sysblock}")
+
+ if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
- # skip this device enterely
+ # skip this subdevice
break
fi
esac
done
+found_eth_dev=""
while true; do
echo -n "Looking for a connected Ethernet interface ..."
2>/dev/null)
# link detected
if [ "$carrier" = 1 ]; then
- echo " found $interface."
+ echo "Connected $interface found"
# inform initrd's init script :
- echo "DEVICE=$interface" >> /conf/param.conf
- exit 0
+ found_eth_dev="$found_eth_dev $interface"
fi
done
- # wait a bit
- sleep 1
+ if [ -n "$found_eth_dev" ]; then
+ echo "DEVICE='$found_eth_dev'" >> /conf/param.conf
+ exit 0
+ else
+ # wait a bit
+ sleep 1
+ fi
done
done
projects / live-boot-grml.git / commitdiff