[SCM] live-boot branch, upstream, updated. upstream/3.0_a26-1-g1070996
Daniel Baumann
daniel at debian.org
Mon Apr 9 17:00:16 UTC 2012
The following commit has been merged in the upstream branch:
commit 10709960de62ab97b4628a49016d0f46676d61e9
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Apr 9 18:59:29 2012 +0200
Adding upstream version 3.0~a27.
diff --git a/Makefile b/Makefile
index ec67501..1ea0a36 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ install:
# Installing docs
mkdir -p $(DESTDIR)/usr/share/doc/live-boot
- cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot
+ cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot
mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
@@ -62,7 +62,7 @@ install:
# Installing manpages
for MANPAGE in manpages/en/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
done
@@ -70,7 +70,7 @@ install:
do \
for MANPAGE in manpages/$${LANGUAGE}/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
done; \
done
@@ -102,7 +102,7 @@ uninstall:
# Uninstalling manpages
for MANPAGE in manpages/en/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE} .en.$${SECTION}).$${SECTION}; \
done
@@ -110,12 +110,12 @@ uninstall:
do \
for MANPAGE in manpages/$${LANGUAGE}/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
rm -f $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
done; \
done
- for SECTION in $(ls manpages/en/* | awk -F. '{ print $2 }'); \
+ for SECTION in $(for MANPAGE in $(ls manpages/en/*); do basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1; done | sort -u); \
do \
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} > /dev/null 2>&1 || true; \
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/*/man$${SECTION} > /dev/null 2>&1 || true; \
diff --git a/VERSION b/VERSION
index 7575db3..1dd4f0a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a26-1
+3.0~a27-1
diff --git a/bin/live-snapshot b/bin/live-snapshot
index ca495fb..6ba45f2 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -3,7 +3,7 @@
# live-snapshot - utility to manage Debian Live systems snapshots
#
# This program mounts a device (fallback to /tmpfs under $MOUNTP
-# and saves the /live/cow (or a different directory) filesystem in it
+# and saves the /live/overlway (or a different directory) filesystem in it
# for reuse in another live-boot session.
# Look at the manpage for more informations.
#
@@ -57,7 +57,7 @@ SAFE_TMPDIR="/live"
# Permits multiple runs
MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)"
DEST="${MOUNTP}/live-sn.cpio.gz"
-DEF_SNAP_COW="/live/cow"
+DEF_SNAP_COW="/live/overlay"
TMP_FILELIST="${PROGRAM}.list"
# Command line defaults and declarations
@@ -365,7 +365,7 @@ Do_filelist ()
if [ -f "${SNAP_LIST}" ]
then
- # if SNAP_COW == /live/cow/home, SNAP_RW = /home
+ # if SNAP_COW == /live/overlay/home, SNAP_RW = /home
SNAP_RW=$(echo "${SNAP_COW}" | sed -e "s|${DEF_SNAP_COW}||g")
if [ -z "${SNAP_RW}" ]
then
@@ -517,9 +517,9 @@ Warn_user ()
;;
esac
- if grep -qv persistent /proc/cmdline
+ if grep -qv persistence /proc/cmdline
then
- echo "Remember to boot this live system with \"persistent\" specified at boot prompt." > /dev/null 1>&2
+ echo "Remember to boot this live system with \"persistence\" specified at boot prompt." > /dev/null 1>&2
fi
fi
}
diff --git a/docs/old/CREDITS b/docs/old/CREDITS
deleted file mode 100644
index 2a1ae50..0000000
--- a/docs/old/CREDITS
+++ /dev/null
@@ -1,25 +0,0 @@
-Patches (alphabetical order):
-
- * Alexandre Garcia <ascii_77 at yahoo.fr>
- * Alex Owen <r.a.owen at qmul.ac.uk>
- * Arnaud Cornet <arnaud.cornet at gmail.com>
- * Bas Wijnen <wijnen at debian.org>
- * Ben Armstrong <synrg at debian.org>
- * Ben Voui <intrigeri at boum.org>
- * Chris Lamb <chris at chris-lamb.co.uk>
- * Davide Natalini <davide.natalini at studio.unibo.it>
- * Frederic Lehobey <Frederic.Lehobey at free.fr>
- * Hadar Weiss <whadar at gmail.com>
- * Jason D. Clinton <me at jasonclinton.com>
- * Jonathan Hall <flimzy at flimzy.com>
- * Kai Hendry <hendry at iki.fi>
- * Malcom Gilles <live at ouabain.org>
- * Marco Amadori <marco.amadori at gmail.com>
- * Mathieu Geli <mathieu.geli at gmail.com>
- * Michael Prokop <mika at grml.org>
- * Michal Suchanek <hramrach at centrum.cz>
- * Oliver Osburg <o.osburg at uni-jena.de>
- * Otavio Salvador <otavio at debian.org>
- * Sebastian Raveau <sebastien.raveau at epita.fr>
- * Steven Shiau <steven at nchc.org.tw>
- * Thomas Lange <lange at informatik.uni-koeln.de>
diff --git a/docs/old/ChangeLog b/docs/old/ChangeLog
deleted file mode 100644
index 4d0e52a..0000000
--- a/docs/old/ChangeLog
+++ /dev/null
@@ -1,635 +0,0 @@
-commit 96aa9285ee39f4d3d4245acd8c78accdf73c1fa8
-Author: Daniel Baumann <daniel at debian.org>
-
- Bumping version to 1.104.1-1.
-
- Makefile | 2 +-
- debian/changelog | 2 +-
- docs/parameters.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 1a226e19e03be8ff90aaa50a7b5b9f202f65b8a4
-Author: Daniel Baumann <daniel at debian.org>
-
- Merging casper 1.104.
-
- docs/ChangeLog.casper | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-commit bb97432f7c5eeb330d108be6607edfe0de85bfa7
-Author: Daniel Baumann <daniel at debian.org>
-
- Bumping version to 1.103.1-1.
-
- Makefile | 2 +-
- debian/changelog | 2 +-
- docs/parameters.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 29c11f22032ccdb71aaccd5f6eb4a9be3efa5741
-Author: Daniel Baumann <daniel at debian.org>
-
- Merging casper 1.103.
-
- docs/ChangeLog.casper | 8 ++++++++
- scripts/live-bottom/23networking | 24 +++++++++++++++---------
- scripts/live-bottom/25configure_init | 8 +++-----
- 3 files changed, 26 insertions(+), 14 deletions(-)
-
-commit 66a175b6255aa061dc78fbd301c9844489c42fc8
-Author: Daniel Baumann <daniel at debian.org>
-
- Preparing live-initramfs 1.102.2-1.
-
- Makefile | 10 +++++-----
- debian/changelog | 6 ++++++
- docs/parameters.txt | 2 +-
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-commit 0b8cf3f17ed46e96fb5efd658c8e308ba1a2dd1a
-Author: Daniel Baumann <daniel at debian.org>
-
- Releasing live-initramfs 1.102.1-1.
-
- debian/changelog | 2 +-
- docs/ChangeLog | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 196 insertions(+), 1 deletions(-)
-
-commit b782261bbdf33ff5c69780cc4c788c339d707f9b
-Author: Daniel Baumann <daniel at debian.org>
-
- Sorting Depends.
-
- debian/control | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 17b3b36ef3c1fa5cbe5b11c9690a2b0a403db693
-Author: Daniel Baumann <daniel at debian.org>
-
- Applied patch from Michael Prokop <mika at grml.org> to depend on busybox.
-
- debian/control | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 27cc7504bc8310e2836014d64576be7d9c974be2
-Author: Daniel Baumann <daniel at debian.org>
-
- Bumping version to 1.102.1-1.
-
- Makefile | 2 +-
- debian/changelog | 2 +-
- docs/parameters.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit 9e5b3c1cbeb80a472ba4387ef7e59b5e6bce913b
-Author: Daniel Baumann <daniel at debian.org>
-
- Merging casper 1.102.
-
- docs/ChangeLog.casper | 10 ++++++
- scripts/live-bottom/42disable_apparmor | 36 ++++++++++++++++++++++
- scripts/live-bottom/42disable_cups_apparmor | 43 ---------------------------
- 3 files changed, 46 insertions(+), 43 deletions(-)
-
-commit 7b5c1e3232d0e02e712a4f984cd1e5009c9e4e9c
-Author: Daniel Baumann <daniel at debian.org>
-
- Adding noapparmor boot parameter.
-
- scripts/live | 5 +++++
- scripts/live-bottom/42disable_cups_apparmor | 5 +++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-commit ea5fee194ea66ab0f41a0a973034db201651e09a
-Author: Daniel Baumann <daniel at debian.org>
-
- Bumping version to 1.101.1-1.
-
- Makefile | 2 +-
- debian/changelog | 2 +-
- docs/parameters.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-commit b525502a2fdf073f4e326c1ca4dd8c89258ef65d
-Author: Daniel Baumann <daniel at debian.org>
-
- Adjusting to live-initramfs.
-
- scripts/live-bottom/42disable_cups_apparmor | 37 ++++++++++++++++----------
- 1 files changed, 23 insertions(+), 14 deletions(-)
-
-commit 9b2894eaf50ce542d03329a0b49bf8df7d633371
-Author: Daniel Baumann <daniel at debian.org>
-
- Merging casper 1.101.
-
- docs/ChangeLog.casper | 9 ++++++++
- scripts/live-bottom/42disable_cups_apparmor | 29 +++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+), 0 deletions(-)
-
-commit f1e9fafee6e04a269a506edd31c62abd6917ecee
-Author: Daniel Baumann <daniel at debian.org>
-
- Merging casper 1.100.
-
- docs/ChangeLog.casper | 8 ++++++++
- scripts/live-bottom/41apt_cdrom | 3 ---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-commit 2df075f459f0a232a084ca6ad037d89764727d5f
-Author: Daniel Baumann <daniel at debian.org>
-
- Using new Homepage field now.
-
- debian/control | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-commit d29346c7b4c7a67fed080ea46be15421dec12fe7
-Author: Daniel Baumann <daniel at debian.org>
-
- Applied patch from Frederic Boiteux <fboiteux at calistel.com> about NFSROOT=auto, <http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-September/002173.html>.
-
- scripts/live | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-commit 4f4c8e22af7a539cfa8bc9ba371c6a57b8e7cb0c
-Author: Daniel Baumann <daniel at debian.org>
-
- Applied patch from Michael Prokop <mika at grml.org> to migrate live-snapshot.en.1 and live-snapshot.it.1 to asciidoc as well.
-
- manpages/Makefile | 17 ++++--
- manpages/live-snapshot.en.1 | 71 --------------------------
- manpages/live-snapshot.en.1.txt | 100 ++++++++++++++++++++++++++++++++++++
- manpages/live-snapshot.it.1 | 70 -------------------------
- manpages/live-snapshot.it.1.txt | 107 +++++++++++++++++++++++++++++++++++++++
- 5 files changed, 219 insertions(+), 146 deletions(-)
-
-commit 3226d2bfd4e2463c9aa7a691f7e9ea132e258af6
-Author: Daniel Baumann <daniel at debian.org>
-
- Adding Marco Amadori <marco.amadori at gmail.com>.
-
- docs/CREDITS | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-commit 757b214139daa0f7f312434ed0f77961ea380c4e
-Author: Daniel Baumann <daniel at debian.org>
-
- Sorting Build-Depends.
-
- debian/control | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-commit 8d6e39ce90ed0be835514a15fbf3a007a2b9f3fa
-Author: Daniel Baumann <daniel at debian.org>
-
- Simplifying make calls.
-
- debian/rules | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit bef37dff239b6c28fef89679537bea8643628fe1
-Author: Daniel Baumann <daniel at debian.org>
-
- Applied patch from Michael Prokop <mika at grml.org> to remove deprecated manpages/live-initramfs.en.7 (switched to asiidoc).
-
- manpages/live-initramfs.en.7 | 127 ------------------------------------------
- 1 files changed, 0 insertions(+), 127 deletions(-)
-
-commit 6a86b38986ab23d5cda24b38dca27c4a659bdfbd
-Author: Daniel Baumann <daniel at debian.org>
-
- Applied patch from Michael Prokop <mika at grml.org> to update debian/control and debian/rules for use of asciidoc.
-
- debian/control | 2 +-
- debian/rules | 2 ++
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-commit 6685b97a4041477b2ccbfc9683e35c022cbe9ce7
-Author: Daniel Baumann <daniel at debian.org>
-
- Applied patch from Michael Prokop <mika at grml.org> to switch to asciidoc for documentation.
-
- manpages/Makefile | 21 +++
- manpages/live-initramfs.en.7.txt | 304 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 325 insertions(+), 0 deletions(-)
-
-commit 3b545dfb73b7ce99c3fd6e107d6843891f005ab1
-Author: Daniel Baumann <daniel at debian.org>
-
- Fixing typing error.
-
- debian/control | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-commit ab933503a8204649724c525facbc14f734f1cd4e
-Author: Daniel Baumann <daniel at debian.org>
-
- Preparing live-initramfs 1.99.3-1.
-
- Makefile | 8 ++++----
- debian/changelog | 6 ++++++
- docs/parameters.txt | 2 +-
- manpages/live-initramfs.en.7 | 2 +-
- manpages/live-snapshot.en.1 | 2 +-
- 5 files changed, 13 insertions(+), 7 deletions(-)
-
-2007-09-09 Daniel Baumann <daniel at debian.org>
-
- * Using common indenting.
- * scripts/live:
- - Applied patch from Jim Paris <jim at jtan.com> to fix wrong usage of
- ipconfig (Closes: #440235).
- * Uploaded 1.99.2-1.
-
-2007-09-09 Michael Prokop <mika at grml.org>
-
- * scripts/live:
- - Extending toram parameter to specify module.
- - Adding forgotten nofstab boot parameter.
- * scripts/live-bottom/40install_driver_updates:
- - Adding check driver updates.
- * scripts/live-bottom/25configure_init:
- - Adding check for file-rc.
- * scripts/live-bottom/21xvidemode:
- - Sorting variable checks always before logging.
- * scripts/live, live-bottom/*:
- - Adding boot parameters to disable each service.
- * scripts/live, live-bottom/22gnome_panel_date:
- - Adding nognomefstab boot parameter.
- * scripts/live-bottom/38disable_restricted_manager:
- - Removing leftover reference to casper-functions.
-
-2007-09-05 Daniel Baumann <daniel at debian.org>
-
- * scripts/live, scripts/live-bottom:
- - Added nouser parameter to disable user creation.
- - Added noxautoconfig parameter to disable xorg re-configuration.
- - Added nohosts parameter to disable /etc/hosts creation.
- * scripts/live-bottom/15autologin:
- - Moved disabling of kpersonalizer to 34disable_kpersonalizer.
-
-2007-09-01 Daniel Baumann <daniel at debian.org>
-
- * Merging changes from casper 1.97, 1.98 and 1.99.
- * Uploaded 1.99.1-1.
-
-2007-08-29 Daniel Baumann <daniel at debian.org>
-
- * scripts/live-bottom/12fstab:
- - By default, we do not have fstab, so it is save to just append the
- unionfs mount rather than overwritting it.
- * hooks/live:
- - Including wget if available.
- * Uploaded 1.96.2-1.
-
-2007-08-21 Daniel Baumann <daniel at debian.org>
-
- * Merging changes from casper 1.96.
- * Uploaded 1.96.1-1.
-
-2007-08-21 Daniel Baumann <daniel at debian.org>
-
- * scripts/live:
- - Applied patch from Jesse W. Hathaway <jesse at mbuki-mvuki.org> to
- not use nfsro with kernels larger than 2.6.22 (where unionfs 2.x
- is supposed to be available soon).
- * Uploaded 1.95.3-1.
-
-2007-08-11 Daniel Baumann <daniel at debian.org>
-
- * Uploaded 1.95.2-1.
-
-2007-08-01 Daniel Baumann <daniel at debian.org>
-
- * scripts/live-bottom/10adduser:
- - Setting debconf preseeding for passwd/make-user manually to true,
- overriding any users preseeding on that, so that the user account
- gets created for sure.
-
-2007-07-29 Daniel Baumann <daniel at debian.org>
-
- * Merging changes from casper 1.95.
- * Uploaded 1.95.1-1.
-
-2007-07-26 Daniel Baumann <daniel at debian.org>
-
- * Merging changes from casper 1.92, 1.93 and 1.94.
-
-2007-07-26 Daniel Baumann <daniel at debian.org>
-
- * bin/live-md5check:
- - Removed, using standard md5sum which makes the md5 check slower,
- doesn't integrate well with usplash yet, but it makes live-initramfs
- architecture independent now.
- * scripts/live:
- - Fixed typo.
- - Added live-media-path as suggested by Jordi Pujol
- <jordi_pujol at telefonica.net>.
- * Uploaded 1.91.6-1.
-
-2007-07-19 Daniel Baumann <daniel at debian.org>
-
- * scripts/live, scripts/live-bottom/02_timezone:
- - Added utc boot parameter as suggested by Vladimir Stavrinov
- <vs at inist.ru>
-
-2007-07-18 Daniel Baumann <daniel at debian.org>
-
- * docs/parameters.txt:
- - Added values for vga parameter.
- * scripts/live:
- - Added patch from Thomas Lange <lange at informatik.uni-koeln.de> to
- respect rootserver name from dhcp.
- * Uploaded 1.91.5-1.
-
-2007-07-12 Daniel Baumann <daniel at debian.org>
-
- * bin/live-snapshot, scripts/live:
- - Moved /cow to /live/cow.
- * scripts/live, scripts/live-bottom/01integrity_check, 05mountpoints:
- - Moved /live_media to /live/image.
- * Uploaded 1.91.4-1.
-
-2007-07-07 Daniel Baumann <daniel at debian.org>
-
- * scripts/live:
- - Added debug parameter.
-
-2007-06-31 Daniel Baumann <daniel at debian.org>
-
- * scripts/live:
- - Added patch from Julian Andres Klode <jak at jak-linux.org> to add
- support for aufs.
- * hooks/live, manpage/live-initramfs.en.7, scripts/live-bottom/12fstab:
- - Added aufs support.
- * Uploaded 1.91.3-1.
-
-2007-06-30 Daniel Baumann <daniel at debian.org>
-
- * scripts/live-bottom/12fstab:
- - Added disabling of /etc/init.d/checkfs.sh to avoid file systemcheck
- at boot time. Added nofastboot parameter to be able to change that.
- - Disabled removal of checkroot.sh.
-
-2007-06-28 Daniel Baumann <daniel at debian.org>
-
- * Applied patch from Mathieu Geli <mathieu.geli at gmail.com> to set the
- timezone with a boot parameter.
-
-2007-06-25 Daniel Baumann <daniel at debian.org>
-
- * scripts/live:
- - Added missing nfsopts boot parameter.
- - Changed default module name from 'order' to 'filesystem'.
- - Changed module extension from '.lst' to '.module'.
- - Check not just for $MODULE.module, but also
- filesystem.$MODULE.module
- - Cleaned up parse_cmdline and is_live_path functions.
- * debian/control, debian/live-initramfs.init,
- scripts/live-premount/10driver_updates:
- - Moving eject to recommends.
- - Added checks for eject existence.
- * Uploaded 1.91.2-1.
-
-2007-06-17 Daniel Baumann <daniel at debian.org>
-
- * debian/live-initramfs.postinst:
- - Made update-initramfs call conditional as suggested by Thomas Lange
- <lange at informatik.uni-koeln.de>.
- * debian/live-initramfs.postrm:
- - Added update-initramfs call to cleanup.
-
-2007-06-17 Daniel Baumann <daniel at debiann.org>
-
- * Added patch from Thomas Lange <lange at informatik.uni-koeln.de> to
- properly load ide-generic after udev.
- * Uploaded 1.91.1-1.
-
-2007-06-15 Daniel Baumann <daniel at debian.org>
-
- * Merging changes from casper 1.91.
-
-2007-06-14 Daniel Baumann <daniel at debian.org>
-
- * scripts/live-bottom/18hostname:
- - Appending to /etc/hosts to not overwrite custom settings.
-
-2007-06-08 Daniel Baumann <daniel at debian.org>
-
- * Merging changes from casper 1.88.
- * Merging changes from casper 1.90.
- * hooks/live:
- - Added force loading of ide-generic module. It is required on some
- systems to boot (reported as needed also for some qemu versions).
- * Uploaded 1.90.1-1.
-
-2007-06-04 Daniel Baumann <daniel at debian.org>
-
- * Uploaded 1.87.6-1.
-
-2007-05-28 Daniel Baumann <daniel at debian.org>
-
- * scripts/live-bottom/42apt_upgrade:
- - Moved to dedicated live-initscripts package.
-
-2007-05-24 Daniel Baumann <daniel at debian.org>
-
- * debian/control:
- - Added casper transitional package.
- - Removed usplash conflicts.
- * scripts/live-bottom/42apt_upgrade:
- - Added, idea taken from Kais webconverger.
- * Uploaded 1.87.5-1.
-
-2007-05-23 Daniel Baumann <daniel at debian.org>
-
- * scripts/*:
- - Minor code cleanup.
-
-2007-05-18 Daniel Baumann <daniel at debian.org>
-
- * scripts/live, scripts/live-bottom/05mountpoints:
- - Replaced 'mount -o move' with 'mount --move'.
- * scripts/live, scripts/live-bottom/10adduser:
- - Added check for 'nosudo' bootparameter to disable automatic
- sudo configuration.
- * scripts/live, scripts/live-bottom/13swap:
- - Renamed 'swapoff' parameter to 'noswap'.
- * scripts/live, scripts/live-bottom/15autologin:
- - Added check for 'noxautologin' bootparameter to disable automatic
- gdm/kdm login.
- * scripts/live, scripts/live-bottom/25configure_init:
- - Added check for 'noautologin' bootparameter to disable automatic
- terminal login.
- * bin/live-snapshot, scripts/live, scripts/live-helpers:
- - Also recognize ext3, but treat it like ext2.
- * Uploaded 1.87.4-1.
-
-2007-05-12 Daniel Baumann <daniel at debian.org>
-
- * scripts/live-bottom/*:
- - Added generic header.
-
-2007-05-12 Daniel Baumann <daniel at debian.org>
-
- * scripts/live:
- - Renamed CASPERCONF to LIVECONF.
- - Renamed CASPERGETTY to LIVE_GETTY.
- - Renamed LIVEMEDIA_* to LIVE_MEDIA_*.
- * Uploaded 1.87.3-1.
-
-2007-05-11 Daniel Baumann <daniel at debian.org>
-
- * hooks/live:
- - Reformated.
- * scripts/live, scripts/live-bottom/13swap:
- - Added check for swapoff bootparameter to disable usage of local swap
- partitions.
-
-2007-05-09 Daniel Baumann <daniel at debian.org>
-
- * manpages/*:
- - Added language suffix.
- - Partially rewritten and reformated.
-
-2007-05-08 Daniel Baumann <daniel at debian.org>
-
- * Makefile, doc/AUTHORS, doc/CREDITS:
- - Added.
- * doc:
- - Renamed to docs.
-
-2007-05-07 Daniel Baumann <daniel at debian.org>
-
- * debian/control:
- - Added suggests to genext2fs and squashfs-tools.
- - Removed depends to dmsetup.
- * scripts/live-bottom/10adduser:
- - Added patch from Ben Armstrong <synrg at debian.org> to write
- $HOME/.su-to-rootrc file.
- * scripts/live, scripts/live-bottom/21xvideomode:
- - Added patch from Mathieu Geli <mathieu.geli at gmail.com> to have the
- ability to force X video mode from kernel append line.
-
-2007-05-06 Daniel Baumann <daniel at debian.org>
-
- * Merging patches from casper 1.81+debian-4, see ChangeLog.casper.
- * conf/live.conf:
- - Renamed HOST to HOSTNAME.
- * debian/init:
- - Added quickreboot.
- - Renamed /cdrom to /live_media.
- * doc/ChangeLog.casper:
- - Added missing debian uploads.
- * manpages/live-initramfs.7:
- - Updated.
- * hooks/live:
- - Reading live.conf earlier.
- - Making some udev copies conditional for ubuntu.
- - Allowing local keymap when using encrypted filesystems.
- * scripts/live:
- - Renamed HOST to HOSTNAME.
- - Renamed /cdrom to /live_media.
- - Added support for live-snapshot.
- - Parsing commandline in one central place now.
- - Added support for encrypted filesytem images.
- - Added support for multiple filesystem images.
- * scripts/live-bottom/01integrity_check:
- - Renamed /cdrom to /live_media.
- * scripts/live-bottom/02etc_live_conf:
- - Added.
- * scripts/live-bottom/05mountpoints:
- - Renamed /cdrom to /live_media.
- - Don't do anything if not required.
- * scripts/live-bottom/10adduser:
- - Changed default password.
- - Disabling xscreensaver locking and copying ubiquity desktop only on
- ubuntu.
- * scripts/live-bottom/14locales:
- - Added handling of locale bootparameter.
- * scripts/live-bottom/15autologin:
- - Added workaround for using gdm default config.
- * scripts/live-bottom/18hostname:
- - Renamed HOST to HOSTNAME.
- * scripts/live-bottom/19keyboard:
- - Added handling of keyboard bootparameter.
- * scripts/live-bottom/20xconfig:
- - Added handling of keyboard bootparameter.
- - Added handling of locale bootparameter.
- * scripts/live-bottom/23networking:
- - Disabled loop over fixed network devices.
- * scripts/live-bottom/24preseed:
- - Added handling of multiple preseeding files.
- - Removed locale handling.
- * scripts/live-bottom/25configure_init:
- - Added handling of serial ttys.
- * scripts/live-bottom/30accessibility:
- - Removed extra parsing of commandline.
- * scripts/live-functions:
- - Added function to really export variables.
- * scripts/live-helpers:
- - Added support for encrypted filesytem images.
-
-2007-05-06 Daniel Baumann <daniel at debian.org>
-
- * bin/casper-getty, casper-login, casper-preseed, casper-reconfigure,
- casper-snapshot:
- - Renamed to live-*.
- * casper-md5check:
- - Moved to bin.
- - Renamed to live-md5check.
- * casper.conf:
- - Moved to conf/live.conf.
- * caspermon:
- - Removed.
- * hooks/casper, scripts/casper, casper-bottom, casper-functions,
- casper-helpers, casper-premount:
- - Renamed to live*.
- * bin/live-getty, live-login:
- - Reformated.
- * conf/live.conf:
- - Reformated.
- - Setting Debian defaults.
- * bin/live-snapshot, debian/dirs, debian/install, debian/rules,
- hooks/live, scripts/live:
- - Replaces casper directory and file names with live-initramfs
- directory and file names.
- * debian/manpage:
- - Moved to manpages.
- - Renamed casper.7 to live-initramfs.7.
- - Renamed casper-snapshot.1 to live-snapshot.1.
- * debian/init:
- - Changed activation parameter from boot=casper to boot=live.
- * scripts/live-bottom/02_timezone:
- - Fixed wrong script description.
- * Uploaded 1.87.2-1.
-
-2007-04-30 Daniel Baumann <daniel at debian.org>
-
- * Forked casper 1.87.
- * COPYING:
- - Added.
- * debian/control, debian/ubiquity-casper.install, ubiquity-hooks:
- - Removed ubiquity support.
- * debian/changelog:
- - Moved old changelog to doc/ChangeLog.casper.
- - Added new changelog for live-initramfs.
- * debian/casper.dirs, casper.init, casper.install, casper.manpages,
- casper.postinst:
- - Renamed, removed packagename prefix from filename.
- * debian/compat, copyright, dirs, manpages:
- - Updated.
- * debian/examples, links:
- - Added.
- * debian/rules:
- - Updated.
- - Added upstream target.
- * debian/control:
- - Updated.
- - Added depends to file.
- - Added conflicts/replaces to casper.
- * debian/postinst:
- - Running 'update-initramfs' for all kernel versions instead of latest
- only.
- * Uploaded 1.87.1-1.
diff --git a/docs/old/ChangeLog.casper b/docs/old/ChangeLog.casper
deleted file mode 100644
index 89ac843..0000000
--- a/docs/old/ChangeLog.casper
+++ /dev/null
@@ -1,3193 +0,0 @@
-casper (1.236) lucid; urgency=low
-
- * Check for LTS in the release name (LP: #558488).
-
- -- Evan Dandrea <evand at ubuntu.com> Wed, 21 Apr 2010 11:12:32 +0100
-
-casper (1.235) lucid; urgency=low
-
- * Unbreak early command from previous commit.
-
- -- Mario Limonciello <Mario_Limonciello at Dell.com> Thu, 15 Apr 2010 02:54:15 -0500
-
-casper (1.234) lucid; urgency=low
-
- * Only bring the network up while running preseed/early_command if
- preseed/allow-network=true.
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 14 Apr 2010 15:56:40 +0100
-
-casper (1.233) lucid; urgency=low
-
- * Bring the network up while running preseed/early_command.
- * Fix use of debconf passthrough frontend; DEBCONF_READFD and
- DEBCONF_WRITEFD were backwards, and DEBIAN_HAS_FRONTEND and
- DEBCONF_REDIR needed to be unset or else confmodule scripts would end up
- trying to talk to closed file descriptors.
- * Run debconf-communicate with a read-only template database and separate
- config databases, and copy any changed values back to the master
- databases at the end. This allows us to use the noninteractive frontend
- rather than passthrough when running apt-get in preseed/early_command or
- dpkg to install driver updates, thereby ensuring that the template
- database is properly initialised (LP: #557011).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 12 Apr 2010 23:41:09 +0100
-
-casper (1.232) lucid; urgency=low
-
- * bump compcache size to 50% on live images for machines with less than
- 512MiB. This makes sure we don't hit OOM errors on systems with only
- 256MiB of RAM.
-
- -- Oliver Grawert <ogra at ubuntu.com> Mon, 12 Apr 2010 08:10:06 +0200
-
-casper (1.231) lucid; urgency=low
-
- [ Jonathan Riddell ]
- * Remove 37kubuntu_netbook_installer_link, now done with a patch in
- kdebase-workspace
-
- [ Colin Watson ]
- * If copying live media to RAM or disk, explicitly copy .disk, since *
- won't expand to include it (LP: #526305).
- * Cache /bin/plymouth and /sbin/usplash_write before ejecting the CD, in
- the hope that that helps with I/O errors on reboot (see LP #539027).
-
- [ Luke Yelavich ]
- * ubiquity-hooks/30accessibility: Copy the orca settings directory to the
- gdm home directory, to allow for preferred orca settings to be used in
- gdm (LP: #551515).
-
- -- Luke Yelavich <themuso at ubuntu.com> Fri, 09 Apr 2010 14:00:51 +1000
-
-casper (1.230) lucid; urgency=low
-
- * Don't save the hardware clock on live CD reboot; we used to do this in
- the sysvinit world, but it regressed when we switched to Upstart
- (thanks, Norm Pierce; LP: #436535).
- * When running update-initramfs on writable media, update initrd.lz rather
- than initrd.gz if it's present, and make the update process a bit safer
- while we're there (LP: #489736).
- * Handle toram and todisk=DEVICE options on command line (LP: #526305).
- * Policy version 3.8.4: no changes required.
- * Convert to source format 3.0 (native).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 30 Mar 2010 11:41:24 +0100
-
-casper (1.229) lucid; urgency=low
-
- [ Jonathan Riddell ]
- * Update scripts/casper-bottom/34disable_kde_services for lucid
-
- [ Evan Dandrea ]
- * Don't let apt try to auto-detect the CD-ROM device using udev. We
- already know what it is, and using udev to find it again wont work
- for USB disks.
-
- -- Evan Dandrea <evand at ubuntu.com> Tue, 23 Mar 2010 11:42:00 +0000
-
-casper (1.228) lucid; urgency=low
-
- * Update for the new libplymouth2.
-
- -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 12 Mar 2010 18:37:02 -0800
-
-casper (1.227) lucid; urgency=low
-
- * casper-md5check: port from usplash to plymouth. LP: #500198
- * fix up our reliance on usplash, /dev/console elsewhere. LP: #506418.
-
- -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 12 Mar 2010 01:12:28 -0800
-
-casper (1.226) lucid; urgency=low
-
- [ Colin Watson ]
- * Stop using removed nfsro option for NFS/unionfs (thanks, Bernhard
- Seibold; LP: #460781).
-
- [ Jonathan Riddell ]
- * Remove scripts/casper-bottom/48enable_kubuntu_netbook and ubiquity-
- hooks/48enable_kubuntu_netbook now enabled in kubuntu-netbook-
- default-settings
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 10 Mar 2010 22:23:04 +0000
-
-casper (1.225) lucid; urgency=low
-
- * Add ubiquity-hooks/49kubuntu_gnome_icon_cache to recreate the Gnome
- icon cache on Kubuntu CDs, removed by livecd-rootfs
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 08 Mar 2010 11:47:01 +0000
-
-casper (1.224) lucid; urgency=low
-
- * Remove ubiquity-hooks/35copy_wallpaper_cache as now implement it in
- ubiquity itself (LP: #530024)
-
- -- Didier Roche <didrocks at ubuntu.com> Mon, 01 Mar 2010 19:41:45 +0100
-
-casper (1.223) lucid; urgency=low
-
- * Bind-mount /dev, /proc, and /sys into /root while running apt-cdrom.
- * Copy /lib/udev/rules.d/60-cdrom_id.rules into the initramfs to go with
- /lib/udev/cdrom_id, so that apt-cdrom will be able to find ID_CDROM=1
- entries when we run it. This should stop update-notifier from
- repeatedly popping up during the live session.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 23 Feb 2010 01:35:30 +0000
-
-casper (1.222) lucid; urgency=low
-
- * scripts/casper-bottom/47une_ubiquity:
- - get back ubiquity favorite icon in UNE live (LP: #524381)
- - rename the script from 47unr_ubiquity to 47une_ubiquity as well
- as "UNR" mention
-
- -- Didier Roche <didrocks at ubuntu.com> Mon, 22 Feb 2010 14:01:25 +0100
-
-casper (1.221) lucid; urgency=low
-
- * Remove the rest of the mythbuntu delta from 10adduser. It will be
- maintained in the mythbuntu-live-autostart package instead so that
- users from ~mythbuntu-dev can administer it.
-
- -- Mario Limonciello <superm1 at ubuntu.com> Sun, 21 Feb 2010 20:22:00 -0600
-
-casper (1.220) lucid; urgency=low
-
- * scripts/casper: calculate memory without "head" utility, thanks to
- Petar Bogdanovic (LP: #25496).
-
- -- Kees Cook <kees at ubuntu.com> Fri, 19 Feb 2010 14:04:18 -0800
-
-casper (1.219) lucid; urgency=low
-
- [ Mario Limonciello ]
- * Disable casper-reconfigure from 22gnome_panel_data. It doesn't (appear) to
- serve a functional purpose as the postinst does nothing different for laptops.
-
- [ Didier Roche ]
- * add 35copy_wallpaper_cache to copy the wallpaper cache created at boot time
- to the main user's directory. First boot will take it into account in
- ureadahead profiling
-
- -- Didier Roche <didrocks at ubuntu.com> Wed, 17 Feb 2010 19:14:53 +0100
-
-casper (1.218) lucid; urgency=low
-
- * Allow dpkg and apt-get to be installed from within commands that operate
- in the chroot via early_command or driver updates. (LP: #521218)
-
- -- Mario Limonciello <Mario_Limonciello at Dell.com> Tue, 16 Feb 2010 13:38:48 -0600
-
-casper (1.217) lucid; urgency=low
-
- [ Luke Yelavich ]
- * ubiquity-hooks/30accessibility: Enable accessible login for the blindness
- and braile accessibility profiles.
-
- [ Colin Watson ]
- * Use egrep rather than 'grep -E' (LP: #512386).
-
- [ Julien Lavergne ]
- * 15autologin: Add support for LXDM autologin (LP: #511976).
-
- [ Evan Dandrea ]
- * Properly shut down debconf-communicate so that its database gets
- written (LP: #518272).
-
- -- Evan Dandrea <evand at ubuntu.com> Thu, 11 Feb 2010 08:25:53 +0000
-
-casper (1.216) lucid; urgency=low
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - Remove code to disable pulseaudio, as it is no longer needed, and
- the supporting code in the pulseaudio package was removed a long time
- ago.
- - Set the default empathy theme to classic for blindness and braille
- accessibility profiles.
-
- [ Jamie Bennett ]
- * Speed up work around debconf-communicate. Replace several calls to
- debconf-communicate with one persistent invocation followed by
- confmodule calls.
- * Disable guest account by rm'ing rather than waiting for dpkg to
- remove it.
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 03 Feb 2010 16:41:57 -0800
-
-casper (1.215) lucid; urgency=low
-
- [ Mario Limonciello ]
- * Support multiple preseed file/urlarguments on the kernel commandline
- rather than just selecting the last one and going with that.
- * debian/control: Set Vcs-Bzr.
-
- [ Jonathan Riddell ]
- * Add scripts/casper-bottom/48enable_kubuntu_netbook and ubiquity-
- hooks/48enable_kubuntu_netbook to enable Plasma Netbook workspace
- for Kubuntu Netbook Remix
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 27 Jan 2010 13:55:42 +0000
-
-casper (1.214) lucid; urgency=low
-
- * 15autologin: simplify the code with escape character evaluation
- (LP: #505140)
-
- -- Didier Roche <didrocks at ubuntu.com> Tue, 12 Jan 2010 08:57:05 +0100
-
-casper (1.213) lucid; urgency=low
-
- * printf does not evaluate escape characters in the argument string.
-
- -- Evan Dandrea <evand at ubuntu.com> Mon, 11 Jan 2010 11:02:12 +0000
-
-casper (1.212) lucid; urgency=low
-
- [ Martin Pitt ]
- * debian/control: Add ${misc:Depends}.
- * debian/control: Bump Standards-Version to 3.8.3 (no changes necessary).
-
- [ Colin Watson ]
- * 15autologin: Use printf rather than echo -e, since its behaviour is
- portable across shells.
-
- [ Evan Dandrea ]
- * Remove scripts/casper-bottom/42disable_apparmor. Apparmor
- 2.3.1+bzr1312-0ubuntu3 and ifupdown 0.6.8ubuntu26 now no-op when
- they detect the live CD environment.
-
- -- Evan Dandrea <evand at ubuntu.com> Fri, 08 Jan 2010 19:56:27 +0000
-
-casper (1.211) lucid; urgency=low
-
- * Readd scripts/casper-bottom/15autologin changes: derivatives have
- now a custom.conf file and still need autologin in live version.
- Merge with my previous fix proposed for sponsoring one week ago:
- use echo -e to enable \n interpretation (/bin/sh is busybox ash
- which behavior differs from vanilla ash interpretor) (LP: #500786)·
-
- -- Didier Roche <didrocks at ubuntu.com> Tue, 05 Jan 2010 20:05:26 +0100
-
-casper (1.210) lucid; urgency=low
-
- [ Scott James Remnant ]
- * Dropped Vcs-Bzr headers, pushed to lp:ubuntu/casper
- * conf-hooks.d/casper: Changed to FRAMEBUFFER=y
-
- [ Colin Watson ]
- * Source /scripts/casper-functions and /scripts/casper-helpers only after
- processing 'prereqs' argument, to avoid lots of warnings with new
- initramfs-tools.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 05 Jan 2010 16:54:54 +0000
-
-casper (1.209) lucid; urgency=low
-
- * Revert the previous change to 15autologin and instead just make sure
- custom.conf does not exist.
-
- -- Evan Dandrea <evand at ubuntu.com> Mon, 04 Jan 2010 11:18:47 +0000
-
-casper (1.208) lucid; urgency=low
-
- [ Martin Pitt ]
- * scripts/casper-bottom/25configure_init: sreadahead is no more, disable
- ureadahead instead.
-
- [ Didier Roche ]
- * scripts/casper-bottom/15autologin: Don't erase /etc/gdm/custom.conf but
- only append autologin on casper startup if needed. This avoids removing
- default session set in this file for ubuntu derivatives which use GDM.
- The script also check if the modification is already there for
- persistent usb keys. (LP: #498971)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 21 Dec 2009 15:54:36 +0100
-
-casper (1.207) lucid; urgency=low
-
- * Drop 46_disable_services. It didn't need to be running on "all" systems
- with casper installed. Mythbuntu systems will pull this in via a package
- that is administerable via ~mythbuntu-dev.
-
- -- Mario Limonciello <superm1 at ubuntu.com> Tue, 24 Nov 2009 22:28:29 -0600
-
-casper (1.206) karmic; urgency=low
-
- * Fix broken /cdrom writable test in 43disable_initramfs
- (LP: #450259).
-
- -- Evan Dandrea <evand at ubuntu.com> Thu, 22 Oct 2009 11:49:15 +0100
-
-casper (1.205) karmic; urgency=low
-
- * scripts/casper-bottom/25configure_init: Disable sreadahead on live CD
- boot. Not only does it profile the live CD boot to no benefit, but it
- also looks as if it may be responsible for breaking Wubi installs by
- reading from partman's synchronisation FIFOs (LP: #439279).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 20 Oct 2009 17:32:02 +0100
-
-casper (1.204) karmic; urgency=low
-
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - .pulse_a11y_nostart -> pulse_a11y_nostart due to being in a system
- directory, to completely match the change in pulseaudio, which I missed
- earlier.
-
- -- Luke Yelavich <themuso at ubuntu.com> Wed, 14 Oct 2009 08:29:07 +1100
-
-casper (1.203) karmic; urgency=low
-
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - Change .pulse_a11y_nostart location to /var/lib/pulseaudio, as per
- the change in pulseaudio itself, to solve a race condition with volume
- settings restore.
-
- -- Luke Yelavich <themuso at ubuntu.com> Mon, 12 Oct 2009 08:31:51 +1100
-
-casper (1.202) karmic; urgency=low
-
- * scripts/casper-bottom/46_disable_services:
- - MythTV backend is now an upstart service, so rename it's conf file
- in /etc/init, rather than using update-rc.d.
-
- -- Mario Limonciello <superm1 at ubuntu.com> Sun, 11 Oct 2009 13:47:00 -0500
-
-casper (1.201) karmic; urgency=low
-
- [ Colin Watson ]
- * Don't prompt to eject the SD card on Babbage boards, since for now it's
- reused as a quasi-boot-floppy (LP: #364273).
-
- [ James Westby ]
- * scripts/casper-bottom/44pk_allow_ubuntu: update to work for polkit-1
- as well. Allow the live cd user to perform any action when at the
- active console. (LP: #447141)
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 09 Oct 2009 16:06:53 +0100
-
-casper (1.200) karmic; urgency=low
-
- * scripts/casper-bottom/20xconfig:
- - Fix xforcevesa to generate a good failsafe xorg.conf (LP: #423969)
-
- -- Mario Limonciello <superm1 at ubuntu.com> Thu, 08 Oct 2009 22:26:42 -0500
-
-casper (1.199) karmic; urgency=low
-
- [ Tormod Volden ]
- * Scan device-mapper (RAID) devices for live filesystem (LP: #385305).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 06 Oct 2009 23:39:57 +0100
-
-casper (1.198) karmic; urgency=low
-
- * scripts/casper: Send PULSELOGO usplash command at startup. (LP: #438762)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 02 Oct 2009 13:51:07 +0200
-
-casper (1.197) karmic; urgency=low
-
- [ Colin Watson ]
- * Fix tty device name construction to work with new upstart (LP: #438678).
-
- [ Loïc Minier ]
- * scripts/casper-bottom/22serialtty: pass -L to getty and set term to vt100.
- * scripts/casper-bottom/22serialtty: set +x...
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 01 Oct 2009 23:27:45 +0100
-
-casper (1.196) karmic; urgency=low
-
- * Extend our hack that arranges to run setupcon after usplash exits to
- cover the new Upstartified usplash as well.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 29 Sep 2009 01:36:55 +0100
-
-casper (1.195) karmic; urgency=low
-
- [ Oliver Grawert ]
- * add support for serialtty= cmdline option for debugging purposes in live
- sessions
-
- [ Colin Watson ]
- * Upstart moved /etc/event.d/ to /etc/init/; adjust shell provision on VTs
- to match (LP: #434769).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 28 Sep 2009 10:52:32 +0100
-
-casper (1.194) karmic; urgency=low
-
- * Fix 47unr_ubiquity shell code to make slightly more sense.
- * Tell mkinitramfs that casper needs usplash (LP: #434980).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 24 Sep 2009 01:29:21 +0100
-
-casper (1.193) karmic; urgency=low
-
- * Sync LSB headers in init script with desired behaviour: don't start
- casper at boot, and stop after umountroot but before halt/reboot.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 14 Sep 2009 13:08:23 +0100
-
-casper (1.192) karmic; urgency=low
-
- [ Colin Watson ]
- * Upgrade to debhelper v7.
-
- [ Jonathan Riddell ]
- * Add 37kubuntu_netbook_installer_link to show ubiquity launcher
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 12 Sep 2009 00:10:03 +0100
-
-casper (1.191) karmic; urgency=low
-
- * Slightly re-work 47unr_ubiquity, so that ubiquity doesn't keep getting
- added to the favourites if persistence is used.·
-
- -- Steve Kowalik <stevenk at ubuntu.com> Tue, 08 Sep 2009 20:35:00 +1000
-
-casper (1.190) karmic; urgency=low
-
- [ Colin Watson ]
- * Don't produce an invalid sed program when trying to remove an applet
- which isn't in the panel (LP: #406188).
-
- [ Tormod Volden ]
- * do not remount filesystems that already have been probed when
- searching for the livefs (LP: #424464)
- * Fix quoting in try_snap (LP: #424742).
- * Silence error messages for non-existent device nodes (LP: #425159).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 07 Sep 2009 13:10:53 +0100
-
-casper (1.189) karmic; urgency=low
-
- * In 10adduser fix path to ubiquity-kde.desktop file
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 02 Sep 2009 14:54:41 +0100
-
-casper (1.188) karmic; urgency=low
-
- * Allow for platform-orion-ehci in ID_PATH to qualify as a "nice_device"
- i.e. one which can host a livefs. This is the name of the USB device
- driver on Marvell Dove boards.
-
- -- Loïc Minier <loic.minier at ubuntu.com> Mon, 31 Aug 2009 14:16:21 +0200
-
-casper (1.187) karmic; urgency=low
-
- * Stop recommending unionfs-fuse, as we're using aufs again in Karmic.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 28 Aug 2009 12:07:14 +0100
-
-casper (1.186) karmic; urgency=low
-
- [ Loïc Minier ]
- * Allow for platform-mxsdhci in ID_PATH to qualify as a "nice_device" i.e.
- one which can host a livefs. This is the new name of this device in
- 2.6.31 kernels on Babbage i.MX51.
-
- [ Steve Kowalik ]
- * Rename 47unr-ubiquity as 47unr_ubiquity, as scripts with dashes don't
- get installed into the initramfs. (LP: #411616)
-
- -- Steve Kowalik <stevenk at ubuntu.com> Fri, 14 Aug 2009 17:39:34 +1000
-
-casper (1.185) karmic; urgency=low
-
- * Actually set 47unr-ubiquity as executable.·
-
- -- Steve Kowalik <stevenk at ubuntu.com> Wed, 12 Aug 2009 10:41:35 +1000
-
-casper (1.184) karmic; urgency=low
-
- [ Evan Dandrea ]
- * Apply the Ubuntu release version to the installer menu entries as well
- (LP: #406187).
-
- [ Colin Watson ]
- * Fix disabling of apt-check (LP: #406191).
-
- [ Steve Kowalik ]
- * Remove the UNR ubiquity .desktop hack in 10adduser.
- * Set ubiquity as a UNR Favourite in 47unr-ubiquity.
-
- -- Steve Kowalik <stevenk at ubuntu.com> Fri, 07 Aug 2009 23:11:58 +0100
-
-casper (1.183) karmic; urgency=low
-
- * Remove erroneous /root prefix on the ubiquity desktop files in
- 10adduser.
-
- -- Evan Dandrea <evand at ubuntu.com> Tue, 21 Jul 2009 14:02:34 +0100
-
-casper (1.182) karmic; urgency=low
-
- [ Evan Dandrea ]
- * Busybox sed does not preserve ownership, so chown after using it.
-
- [ Colin Watson ]
- * Set AutomaticLogin=$USERNAME, not =ubuntu (thanks, arky; LP: #401321).
-
- [ Mario Limonciello ]
- * Add support for lzma type archives to casper-new-uuid.
-
- -- Mario Limonciello <mario_limonciello at dell.com> Mon, 20 Jul 2009 17:36:55 -0500
-
-casper (1.181) karmic; urgency=low
-
- * Insert a version number in the name field for ubiquity's desktop file
- (LP: #154506).
-
- -- Evan Dandrea <evand at ubuntu.com> Wed, 15 Jul 2009 10:11:40 +0100
-
-casper (1.180) karmic; urgency=low
-
- [ Colin Watson ]
- * scripts/casper-bottom/15autologin: Minor consistency fixes.
-
- [ Martin Pitt ]
- * scripts/casper-bottom/15autologin: Update for new gdm custom configuration
- file (/etc/gdm/custom.conf). (LP: #395861)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 06 Jul 2009 16:40:00 +0200
-
-casper (1.179) karmic; urgency=low
-
- [ Colin Watson ]
- * If LIVE_MEDIA_PATH is set on the command line, record it in
- /etc/casper.conf for the benefit of ubiquity.
-
- [ Martin Pitt ]
- * scripts/casper-bottom/15autologin: Update to work with new gdm.
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 03 Jul 2009 14:51:57 +0200
-
-casper (1.178) karmic; urgency=low
-
- * Ensure that unionfs-fuse isn't killed by /etc/init.d/sendsigs on
- shutdown (LP: #386010).
- * Patches from "phl" (https://launchpad.net/~ubuntu-leledy), adjusted by
- me, to fix snapshot resync:
- - Avoid using cpio -u -d options if klibc cpio is in use (LP: #384059).
- - Copy /etc/casper.conf into /root, otherwise we forget snapshot resync
- settings (LP: #384061).
- - Adjust the first field of *SNAP entries in casper.conf to be relative
- to /cow, not /root (LP: #384066).
- - Prefix $DEST with $MOUNTP in casper-snapshot (LP: #384068).
- - /etc/init.d/casper is usually called with 'start', so handle that as
- well as 'stop' to do snapshot resyncing and CD ejecting (LP: #384076).
- * Fix casper-snapshot(1) syntax to avoid missing spaces between options
- and their values.
- * Fix showmounts when used in conjunction with unionfs-fuse; read-only
- filesystems need to be bind-mounted rather than move-mounted.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 12 Jun 2009 13:24:28 +0100
-
-casper (1.177) karmic; urgency=low
-
- * Port from Debian (thanks, Daniel Baumann):
- - Added live-media-path as suggested by Jordi Pujol.
- - Tail casper.log and show its messages during boot (thanks, Michal
- Suchanek; LP: #363886).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 04 Jun 2009 03:10:59 +0100
-
-casper (1.176) karmic; urgency=low
-
- [ Colin Watson ]
- * Fix symlinking of anacron to /bin/true.
-
- [ Martin Pitt ]
- * Drop scripts/casper-bottom/38jockey_disable_check: Some drivers, like wl
- or printer drivers, do need to be advertised in a live system. Jockey has
- been fixed to not advertise video drivers automatically if the packages
- aren't available (such as in the live system), and even if we should ever
- put them back, it is easier to disable the notifications in jockey's
- handlers instead of here. (LP: #381687)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 02 Jun 2009 15:40:05 +0200
-
-casper (1.175) karmic; urgency=low
-
- * Suppress error message if
- /root/usr/share/applications/firefox-fav.desktop doesn't exist.
- * Add unionfs-fuse support.
- * Automatically fall back to unionfs-fuse if the default union filesystem
- is not available but unionfs-fuse is.
-
- -- Colin Watson <cjwatson at ubuntu.com> Sun, 24 May 2009 12:28:00 +0100
-
-casper (1.174) karmic; urgency=low
-
- * debian/control: Increase dependency on initramfs-tools to get the version
- that uses blkid, depend on util-linux as well
- * hooks/casper: No need to copy vol_id into the initramfs image.·
- * scripts/casper-bottom/13swap: Use blkid -o udev -p instead of vol_id,
- there's probably a much cleaner way to check for RAID like this, but
- this is the direct equivalent.
- * scripts/casper-helpers (get_fstype): use a blkid call to get the type·
- * scripts/casper-helpers (find_cow_device): use a blkid call to get the
- label
-
- -- Scott James Remnant <scott at ubuntu.com> Tue, 12 May 2009 13:29:41 +0100
-
-casper (1.173) jaunty; urgency=low
-
- * Don't use head -n1 in where_is_mounted, we don't have head in the
- initramfs. LP: #363038.
-
- -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 17 Apr 2009 22:22:06 -0700
-
-casper (1.172) jaunty; urgency=low
-
- * 43disable_updateinitramfs: The /cdrom mount has been moved to
- /root/cdrom by the time this script runs, so check that instead.
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 09 Apr 2009 18:30:29 +0100
-
-casper (1.171) jaunty; urgency=low
-
- * Set MP_QUIET to -q instead of -Q on Ubuntu as well, and not just for
- Debian as the modprobe in the latest upstream release of module-init-tools
- doesn't accept -Q anymore.
-
- -- Loic Minier <lool at dooz.org> Wed, 08 Apr 2009 17:31:40 +0200
-
-casper (1.170) jaunty; urgency=low
-
- * is_nice_device(): allow devices with an ID_PATH of platform-mmc* as well
- as used for instance for SD cards on the ARM iMX51 Babbage board;
- LP: #357700.
-
- -- Loic Minier <lool at dooz.org> Wed, 08 Apr 2009 15:34:01 +0200
-
-casper (1.169) jaunty; urgency=low
-
- * [ -w /cdrom ] turns out not to be a sufficient test for files under
- /cdrom being writable; with busybox, it always returns true even for
- read-only filesystems. Explicitly check for the read-only flag in mount
- output to work around this.
- * Fix where_is_mounted helper function to actually produce output (thanks,
- Steve Dodd; LP: #346941).
- * Add a comment to find_cow_device explaining why the choice of
- filesystems is restricted (I asked for this comment in LP #230703 but it
- apparently never got written).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 07 Apr 2009 01:47:05 +0100
-
-casper (1.168) jaunty; urgency=low
-
- * Fix writing of "$@" to diverted update-initramfs script (here-documents
- perform parameter expansion unless the delimiter is quoted).
- * Don't bring up a temporary network interface while fetching the preseed
- file when netbooting, as that will disconnect our root filesystem
- (LP: #351982).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 31 Mar 2009 15:39:29 +0100
-
-casper (1.167) jaunty; urgency=low
-
- * Disable kwallet from KDE 4 in 34disable_kde_services
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 27 Mar 2009 18:40:35 +0000
-
-casper (1.166) jaunty; urgency=low
-
- [ Emmet Hikory ]
- * Show the ubiquity icon in kourou (LP: #338730)
-
- [ Timo Jyrinki ]
- * Move examples.desktop to Desktop/ if it exists, as an alternative to
- Examples (LP: #45489).
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - Make the special case disabling of pulseaudio per user, and not system
- wide.
- - Also disable PulseAudio for the Braille profile.
- - Fix incorrect paths when chowning files.
- - Don't use /root for the ubiquity hook accessibility script, /target is
- where the installed system is located.
- - Remove laptop detect code. Its not currently working, and getting it to
- work requires invasive changes.
- - Only set pulseaudio settings and create the .orca directory if sed
- packages are installed on the live filesystem and installed system.
- * ubiquity-hooks/30accessibility: Copy orca settings to the installed system.
-
- -- Luke Yelavich <themuso at ubuntu.com> Fri, 27 Mar 2009 14:38:20 +1100
-
-casper (1.165) jaunty; urgency=low
-
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - When the blindness accessibility profile is chosen, create the .orca
- directory in the live user's home directory. This seems to allow orca
- to properly reload and use settings in the live session without needing
- to be restarted. This is only needed for the blindness profile, due to
- the other profiles that use orca already creating the .orca directory.
- (LP: #194992)
-
- -- Luke Yelavich <themuso at ubuntu.com> Fri, 20 Mar 2009 08:37:20 +1100
-
-casper (1.164) jaunty; urgency=low
-
- * Update 34disable_kde_services to not start
- update-notifier-kde or plasma's contact plugin which uses akonadi
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 18 Mar 2009 18:07:52 +0000
-
-casper (1.163) jaunty; urgency=low
-
- * 34disable_kwallet moved to 34disable_kde_services and disables
- various services not needed by live CDs
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 13 Mar 2009 14:33:13 +0000
-
-casper (1.162) jaunty; urgency=low
-
- * If /cdrom is writable, call the diverted update-initramfs and copy
- the resulting kernel and initrd to /cdrom/casper (LP: #292159).
-
- -- Evan Dandrea <evand at ubuntu.com> Tue, 10 Mar 2009 14:36:30 +0000
-
-casper (1.161) jaunty; urgency=low
-
- [ Juanje Ojeda ]
- * Regenerate SSL certificate at boot so that it isn't the same for all
- live CD users (LP: #337723).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 10 Mar 2009 10:39:21 +0000
-
-casper (1.160) jaunty; urgency=low
-
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - Adjust sudoers file to allow ORBIT_SOCKET_DIR, XDG_SESSION_COOKIE and
- GTK_MODULES environment variables through to root, for v2, v3, and
- braille profiles. This allows users to use administrative GTK/GNOME
- applications executed by gksudo with accessibility tools like orca.
-
- -- Luke Yelavich <themuso at ubuntu.com> Tue, 10 Mar 2009 15:38:17 +1100
-
-casper (1.159) jaunty; urgency=low
-
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - Disable pulseaudio for the blindness profile, as pulseaudio and espeak
- and portaudio v19 do not play very well with each other, lots of
- crackling, cut of speech. At least espeak via ALSA natively is usable,
- and latency is relatively low.
-
- -- Luke Yelavich <themuso at ubuntu.com> Tue, 10 Mar 2009 09:03:06 +1100
-
-casper (1.158) jaunty; urgency=low
-
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - use laptop_detect function in blindness profile as well
-
- -- Luke Yelavich <themuso at ubuntu.com> Mon, 09 Mar 2009 14:07:17 +1100
-
-casper (1.157) jaunty; urgency=low
-
- [ Emmet Hikory ]
- * 10adduser: add Category=Favorites support for netbook-launcher
- (LP: #334656)
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility && ubiquity-hooks/30accessibility:
- - Remove the fast user switch applet from the top panel, to re-enable
- the logout/shutdown menu options in the system menu. This is done for
- the speech and braille accessibility profiles. Requiring several
- keyboard shortcuts to access something that is not entirely accessible
- yet only makes things difficult for blind/vision impaired users, and is
- likely to cause much confusion if sed menu entries are not present.
-
- -- Luke Yelavich <themuso at ubuntu.com> Tue, 03 Mar 2009 15:49:21 +1100
-
-casper (1.156) jaunty; urgency=low
-
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - If using a laptop, enable the laptop keyboard layout
- - There is no longer a need to set gconf values as root in only-ubiquity
- mode
-
- -- Luke Yelavich <themuso at ubuntu.com> Fri, 06 Feb 2009 08:59:52 +0100
-
-casper (1.155) jaunty; urgency=low
-
- [ Colin Watson ]
- * Add myself to debian/copyright as an author, as I've done fairly
- significant work on this.
- * Eliminate casper-md5check's libm linkage; patch from "SurJector" who
- points out that the automatic conversion is sufficient (LP: #293613).
- * Restore showmounts/show-cow option (thanks, Carlo de Wolf and "probono";
- LP: #159006, #290330).
-
- [ Evan Dandrea ]
- * Add support for ext4.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 30 Jan 2009 12:14:00 +0000
-
-casper (1.154) jaunty; urgency=low
-
- [ Evan Dandrea ]
- * scripts/casper-bottom/02timezone:
- - Remove as it's no longer needed and resets the timezone when
- persistence is enabled (LP: #296855).
-
- [ Colin Watson ]
- * Preseed console-setup/optionscode and console-setup/codesetcode to the
- empty string on boot to avoid debris from the live filesystem build
- process getting in the way of installation (LP: #94177).
-
- -- Colin Watson <cjwatson at ubuntu.com> Sun, 23 Nov 2008 12:44:45 +0000
-
-casper (1.153) jaunty; urgency=low
-
- * scripts/casper-bottom/10adduser:
- - Create links for Mythbuntu items on the Desktop too.
- - Don't show removable drives on Mythbuntu desktop
- * scripts/casper-bottom/46disable_services:
- - New script for disabling services unnecessary to Live
- mode that should still start after being installed.
-
- -- Mario Limonciello <superm1 at ubuntu.com> Tue, 04 Nov 2008 01:25:59 -0600
-
-casper (1.152) intrepid; urgency=low
-
- * Use kde4rc now for accessibility profiles
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Sat, 25 Oct 2008 23:44:54 +0100
-
-casper (1.151) intrepid; urgency=low
-
- * Force ubiquity to --automatic mode for ubuntu-mid
-
- -- Emmet Hikory <persia at ubuntu.com> Thu, 16 Oct 2008 15:31:16 +0100
-
-casper (1.150) intrepid; urgency=low
-
- * Fix path to Kubuntu help file in 10adduser (really)
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 16 Oct 2008 12:16:54 +0100
-
-casper (1.149) intrepid; urgency=low
-
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Revert to using gconf keys for starting orca, as this is now what
- orca does when the user chooses to automatically start orca from Orca's
- preferences window.
- - Explicitly set orca as the program to start up for magnification,
- speech, and braille.
-
- -- Luke Yelavich <themuso at ubuntu.com> Thu, 16 Oct 2008 11:33:02 +1100
-
-casper (1.148) intrepid; urgency=low
-
- * Skip remounting read-only in try_mount as it's unnecessary and
- breaks persistence. Thanks James Westby (LP: #274076).
-
- -- Evan Dandrea <evand at ubuntu.com> Wed, 15 Oct 2008 13:09:57 -0400
-
-casper (1.147) intrepid; urgency=low
-
- * Fix path to Kubuntu help file in 10adduser
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 15 Oct 2008 12:49:29 +0100
-
-casper (1.146) intrepid; urgency=low
-
- * Update About Kubuntu link in 10adduser for KDE 4
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 06 Oct 2008 17:54:15 +0100
-
-casper (1.145) intrepid; urgency=low
-
- * 38disable_restricted_manager: Remove some obsolete l-r-m and
- restricted-manager code, and rename the script to 38jockey_disable_check
- to better reflect its purpose.
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 06 Oct 2008 09:21:40 +0200
-
-casper (1.144) intrepid; urgency=low
-
- * Bump media detection timeout to a minute; thanks to Tormod Volden and
- Steve Beattie for analysis (LP: #258432).
- * Note that this changes (fixes?) the semantics of LIVEMEDIA_TIMEOUT due
- to not using hex values in a for loop which aren't understood by test
- -lt (thanks, Steve Beattie).
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 26 Sep 2008 18:35:13 +0100
-
-casper (1.143) intrepid; urgency=low
-
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility: Change the way that orca is set to
- automatically start. Orca can be started via a gconf key, however this
- is not reflected in the orca UI, and doesn't easily allow the user to
- prevent orca from autostarting on an installed system.
-
- -- Luke Yelavich <themuso at ubuntu.com> Wed, 24 Sep 2008 10:37:35 +1000
-
-casper (1.142) intrepid; urgency=low
-
- * Fix syntax error introduced by is_nice_device regex fix.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 19 Sep 2008 02:30:59 +0100
-
-casper (1.141) intrepid; urgency=low
-
- [ Johannes Ballé ]
- * Handle spaces in file names in md5sum.txt (LP: #251112).
-
- [ Colin Watson ]
- * Support ?= (set value but don't mark as seen) preseeding syntax in
- preseed script; previously we only supported it in the keyboard script,
- which confusingly doesn't deal with propagating console-setup/* preseeds
- to the target filesystem (LP: #253749).
- * Update to localechooser's new languagelist format.
-
- [ Tormod Volden ]
- * scripts/casper: don't scan floppy drives for livefs images (LP: #97306)
- * scripts/casper: fix broken RE in is_nice_device() (LP: #250328)
- * scripts/casper: properly use argument $1 in matches_uuid()
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 19 Sep 2008 02:14:05 +0100
-
-casper (1.140) intrepid; urgency=low
-
- [ Colin Watson ]
- * Disable jockey as well as the old restricted-manager. While jockey does
- do more than restricted-manager did, it also still uses a good chunk of
- memory for a use case that's fairly limited on the live CD.
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Check that usr/bin/orca exists and is executable before creating user
- settings files.
-
- -- Luke Yelavich <themuso at ubuntu.com> Fri, 12 Sep 2008 19:23:41 +1000
-
-casper (1.139) intrepid; urgency=low
-
- * add compcache conf.d configuration for initramfs-tools
-
- -- Oliver Grawert <ogra at ubuntu.com> Thu, 14 Aug 2008 00:25:54 +0200
-
-casper (1.138) intrepid; urgency=low
-
- [ Tormod Volden ]
- * use full path for vol_id in swap-on-raid detection (LP: #136804)
-
- [ Martin Pitt ]
- * 33enable_apport_crashes: Change the apport default file, not the
- update-notifier gconf keys, to undo the corresponding change for disabling
- apport right before the release.
- * Add 45disable_guest_account: Purge the gdm-guest-session package from the
- live system, since having guest sessions in a live session does not make
- much sense. (See gdm-guest-login spec)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Thu, 31 Jul 2008 14:19:07 +0200
-
-casper (1.137) intrepid; urgency=low
-
- * Update scripts/casper-bottom/15autologin for KDM from KDE 4.
- * Update 32disable_hibernation for KDE 4.
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 17 Jul 2008 13:41:38 +0100
-
-casper (1.136) intrepid; urgency=low
-
- * Remove bad-and-wrong setting of PATH to include directories under /root;
- now that grep links to more libraries than before, this broke a number
- of things. Requires initramfs-tools (>= 0.92bubuntu5) because this
- doesn't work with klibc chroot.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 11 Jul 2008 12:34:35 +0100
-
-casper (1.135) intrepid; urgency=low
-
- [ Loic Minier ]
- * Fix use of PREREQ instead of PREREQS in hooks/casper.
-
- [ Colin Watson ]
- * Fix mount argument ordering for klibc mount.
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 09 Jul 2008 12:34:26 +0100
-
-casper (1.134) intrepid; urgency=low
-
- [ Evan Dandrea ]
- * Do not use mode= when mounting /cow using persistent mode (LP: #219192).
-
- [ Colin Watson ]
- * Support ?= (set value but don't mark as seen) preseeding syntax for
- console-setup/* (LP: #64058).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 30 Jun 2008 23:52:41 +0100
-
-casper (1.133) intrepid; urgency=low
-
- [ Tormod Volden ]
- * Do not use swap on RAID raw devices (LP: #136804)
-
- [ Agostino Russo ]
- * Test if livemedia is a directory before trying to mount it as a
- loopfile
- * Reverted changes to casper-helpers as requested by Mithrandir since
- replaying the journal on a hibernated system would lead to file system
- corruption (LP: #230703).
-
- -- Evan Dandrea <evand at ubuntu.com> Wed, 18 Jun 2008 12:34:58 -0400
-
-casper (1.132ubuntu0.2) hardy-proposed; urgency=low
-
- * Test if livemedia is a directory before trying to mount it as a
- loopfile
- * Reverted changes to casper-helpers as requested by Mithrandir since
- replaying the journal on a hibernated system would lead to file system
- corruption (LP: #230703).
-
- -- Agostino Russo <agostino.russo at gmail.com> Tue, 10 Jun 2008 00:27:12 +0100
-
-casper (1.132ubuntu0.1) hardy-proposed; urgency=low
-
- * Do not scan only vfat volumes when looking for cow devices (LP: #230703)
- * Allow casper to use a squashfs filesystem within an arbitrary path (LP:
- #230716, #207137)
-
- -- Agostino Russo <agostino.russo at gmail.com> Thu, 15 May 2008 22:10:50 +0100
-
-casper (1.132) intrepid; urgency=low
-
- [ Colin Watson ]
- * Switch default unionfs implementation to aufs.
-
- [ Agostino Russo ]
- * Do not scan only vfat volumes when looking for cow devices (LP: #230703)
- * Allow casper to use a squashfs filesystem within an arbitrary path (LP:
- #230716, #207137)
-
- -- Evan Dandrea <evand at ubuntu.com> Wed, 28 May 2008 15:01:30 -0400
-
-casper (1.131) hardy; urgency=low
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility: Set gconf and orca config values as
- root in automatic-ubiquity, only-ubiquity, and debug-ubiquity modes.
- * ubiquity-hooks/30accessibility: Remove unneeded gconf call to disable esd.
-
- [ Colin Watson ]
- * Ensure that the live CD user's Desktop directory is owned by them, not
- by root (LP: #218576).
- * Duplicate a chunk of console-setup logic into the keyboard script so
- that we can deal with non-Latin keymaps and the like without having to
- have gfxboot-theme-ubuntu help us; the previous approach broke other
- uses of console-setup, and thus the alternate install CD (LP: #218754).
- This should later be replaced by just running console-setup, and I'll
- open another bug for this.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 21 Apr 2008 14:52:05 +0100
-
-casper (1.130) hardy; urgency=low
-
- * Handle use of debian-installer/language for locale selection
- (LP: #213930).
-
- -- Colin Watson <cjwatson at ubuntu.com> Sat, 12 Apr 2008 00:30:10 +0100
-
-casper (1.129) hardy; urgency=low
-
- * Add COPYING file with GPL text (LP: #211923).
- * Add casper-new-uuid script to simplify UUID regeneration process,
- contributed by Mario Limonciello of Dell (LP: #209847).
- * Update casper-snapshot for genext2fs --reserved-blocks =>
- --reserved-percentage option change (LP: #202048). Add a Breaks as the
- most lightweight available method of documenting that we need genext2fs
- >= 1.4.1 for this.
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 10 Apr 2008 01:45:47 +0100
-
-casper (1.128) hardy; urgency=low
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Update gconf keys to ensure onboard actually gets loaded.
- - Change ownership of created orca settings files to the user.
- - Add extra bits to make orca settings actually work.
-
- [ Evan Dandrea ]
- * Add mode=755 to the tmpfs mount that becomes / in the unionfs mount
- so that / in the live filesystem does not end up with 777 permissions
- (LP: #206030).
-
- [ Colin Watson ]
- * Make scripts/casper-bottom/38disable_restricted_manager executable
- again.
- * Depend on uuid-runtime for uuidgen.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 31 Mar 2008 18:11:55 +0100
-
-casper (1.127) hardy; urgency=low
-
- * Leave spawning the noninteractive ubiquity frontend to its initscript.
-
- -- Evan Dandrea <evand at ubuntu.com> Tue, 25 Mar 2008 15:52:32 -0400
-
-casper (1.126) hardy; urgency=low
-
- * scripts/casper-bottom/10adduser: Test for konqueror not kdesktop,
- stops putting a broken icon on the Kubuntu KDE 4 desktop
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 25 Mar 2008 15:42:31 +0000
-
-casper (1.125) hardy; urgency=low
-
- [ Colin Watson ]
- * Stop quoting Exec arguments in .desktop files. Apparently this used to
- work but now the system conforms more strictly to the desktop entry
- specification (LP: #204185).
-
- [ Jonathan Riddell ]
- * scripts/casper-bottom/15autologin: Enable auto-login for KDM-KDE4
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 20 Mar 2008 10:20:17 +0000
-
-casper (1.124) hardy; urgency=low
-
- [ Colin Watson ]
- * Name generated snapshot images according to their type (LP: #202699).
-
- [ Martin Pitt ]
- * scripts/casper-bottom/44pk_allow_ubuntu: Remove erroneous blank line at
- the start of PolicyKit.conf, since this is invalid XML. This broke
- PolicyKit completely on the live system.
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 18 Mar 2008 10:20:08 +0100
-
-casper (1.123) hardy; urgency=low
-
- * Add scripts/casper-bottom/44pk_allow_ubuntu: Allow PolicyKit privileges
- without password to the default live session user. This avoids the need to
- press Enter at the password prompt, which is quite confusing. Thanks to
- MarioDebian! (LP: #201852)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 14 Mar 2008 17:26:37 +0100
-
-casper (1.122) hardy; urgency=low
-
- * Fix paths in About Kubuntu links
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 14 Mar 2008 15:12:38 +0000
-
-casper (1.121) hardy; urgency=low
-
- * Use a link for About Kubuntu docs in Kubuntu-KDE4
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 12 Mar 2008 23:57:50 +0000
-
-casper (1.120) hardy; urgency=low
-
- * Use dhclient directly instead of ifupdown for the url= kernel cmdline
- argument so that we don't have to worry about the interfaces file
- propagating to the installed system.
-
- -- Evan Dandrea <evand at ubuntu.com> Tue, 11 Mar 2008 13:08:08 -0400
-
-casper (1.119) hardy; urgency=low
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Disable compiz for screen reader and braille terminal accessibility
- profiles. It is currently not possible to get feedback about open
- windows when cycling through them using ALT + Tab with Compiz.
- * ubiquity-hooks/30accessibility: Add braille terminal profile.
-
- [ Colin Watson ]
- * Always set language in both /etc/default/locale and /etc/environment
- (thanks, Sebastien Bacher).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 03 Mar 2008 10:21:42 +0000
-
-casper (1.118) hardy; urgency=low
-
- [ Julian Andres Klode, Colin Watson ]
- * Use aufs instead of unionfs if union=aufs is given (LP: #187259).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 14 Feb 2008 18:00:36 +0000
-
-casper (1.117) hardy; urgency=low
-
- * Disable speech for magnifier and braille profiles again. Thanks
- Luke Yelavich.
- * esd is enabled by default, so the comment in 30accessibility is no
- longer relevant.
-
- -- Evan Dandrea <evand at ubuntu.com> Wed, 13 Feb 2008 01:20:22 -0500
-
-casper (1.116) hardy; urgency=low
-
- * Fix setting orca options in 30accessibility.
- * Remove gdm and kdm from init when using automatic-ubiquity and
- only-ubiquity. The ubiquity initscript will take care of spawning
- these.
-
- -- Evan Dandrea <evand at ubuntu.com> Mon, 11 Feb 2008 12:19:39 -0500
-
-casper (1.115) hardy; urgency=low
-
- * Add the user to the groups specified by user-setup-udeb.
-
- -- Evan Dandrea <evand at ubuntu.com> Thu, 24 Jan 2008 19:08:33 +0000
-
-casper (1.114) hardy; urgency=low
-
- [ Colin Watson ]
- * casper-md5check: Close md5_file before exiting.
- * Disable tracker-applet as well as trackerd, otherwise the former starts
- the latter.
- * casper-snapshot: Fix argument parsing (thanks, Tormod Volden;
- LP: #179411).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 15 Jan 2008 18:25:21 +0000
-
-casper (1.113) hardy; urgency=low
-
- [ Tollef Fog Heen ]
- * dpkg-divert away update-initramfs as it's useless on live CDs and
- annoying when people install LVM and similar tools in order to rescue
- a system. LP: #150188
-
- [ Colin Watson ]
- * Adjust /etc/sudoers editing code so that it doesn't repeatedly add
- "NOPASSWD:" in persistent mode (LP: #175159).
- * Avoid ejecting the CD if booting from an ISO image rather than from a
- physical CD (thanks, Agostino Russo; LP: #176014).
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 19 Dec 2007 09:17:50 +0000
-
-casper (1.112) hardy; urgency=low
-
- * hooks/casper: no need to copy udevinfo into the initramfs, it's already
- there inside udevadm
- * scripts/casper: call udevadm with trigger and settle arguments
- * scripts/casper-bottom/23networking: call udevadm with trigger and
- settle arguments
- * scripts/casper-helpers: call udevadm with info and settle arguments
-
- -- Scott James Remnant <scott at ubuntu.com> Fri, 14 Dec 2007 15:00:29 +0000
-
-casper (1.111) hardy; urgency=low
-
- * Remove code to set the progress bar to throbbing, this now comes as
- standard so we don't need to duplicate it or override things that
- attempted to set progress. LP: #162397.
-
- -- Scott James Remnant <scott at ubuntu.com> Tue, 13 Nov 2007 20:49:31 +0000
-
-casper (1.110) gutsy; urgency=low
-
- * Don't generate fglrx or the nvidia modules in the live session at boot;
- we disable restricted-manager in the live session anyway so they aren't
- straightforward to use (see #43706). Saves about 19 MB of memory.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 05 Oct 2007 21:28:29 +0100
-
-casper (1.109) gutsy; urgency=low
-
- * Cache the stty binary before ejecting the CD.
- * Skip the CD eject prompt if 'noprompt' is on the kernel command line
- (LP: #149159).
- * Try each of (e.g.) 2.6.22-13-generic, 2.6.22-13, and 2.6.22 in turn as
- directory names for driver updates (LP: #122430).
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 05 Oct 2007 03:24:43 +0100
-
-casper (1.108) gutsy; urgency=low
-
- * If CASPER_GENERATE_UUID is set, generate a random UUID in the initramfs,
- and check it against the discovered medium (unless booting with the
- ignore_uuid parameter). This allows live CD images to be safely copied
- to the hard disk without causing problems when booting future live CDs
- (LP: #144800).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 04 Oct 2007 14:23:37 +0100
-
-casper (1.107) gutsy; urgency=low
-
- * Fix gconf keys for suspend and hibernate (thanks, Oliver Grawert;
- LP: #144790).
- * Enable suspend again since as far as I can see we no longer need to
- probe DMI while figuring out whether to enable it (see #61535).
- * Add a 'textonly' boot option to disable X (LP: #65818).
- * Write the please-remove-CD message to /dev/console so that it works even
- if usplash isn't running, and make sure to set /dev/console into a sane
- state so that pressing Enter doesn't just result in ^M being displayed.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 02 Oct 2007 15:12:57 +0100
-
-casper (1.106) gutsy; urgency=low
-
- * Support preseed/early_command; code supplied here will be run using 'sh
- -c' from casper-bottom, and can chroot to /root if needed (LP: #144845).
- * Make sure we don't accidentally continue to boot if casper-md5check
- fails (LP: #82856).
- * Clear out debconf database backup files after preseeding to save memory
- (LP: #43706).
- * Mount everything as noatime to avoid unnecessary metadata writes.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 28 Sep 2007 15:27:52 +0100
-
-casper (1.105) gutsy; urgency=low
-
- * scripts/casper-bottom/36disable_trackerd: Disable trackerd in the live
- session; it's not very useful in this context and it uses a fair bit of
- memory.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 24 Sep 2007 17:25:50 +0100
-
-casper (1.104) gutsy; urgency=low
-
- * casper-md5check: Fall back to text output if opening the usplash FIFO
- fails (LP: #131209).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 20 Sep 2007 01:07:45 +0100
-
-casper (1.103) gutsy; urgency=low
-
- * Disable anacron harder so that it doesn't get started by battery events.
- * Don't write out DHCP network interface stanzas if network-manager is
- installed (LP: #139403).
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 19 Sep 2007 12:52:21 +0100
-
-casper (1.102) gutsy; urgency=low
-
- * Rename 42disable_cups_apparmor to 42disable_apparmor and remove AppArmor's
- rc.d startup links instead of just disabling the cups profile. AA profiles
- will not generally work on the live system, so disabling it completely
- allows us to ship more profiles without worrying any further.
- (LP: #131976)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 14 Sep 2007 08:37:50 +0200
-
-casper (1.101) gutsy; urgency=low
-
- * Add scripts/casper-bottom/42disable_cups_apparmor: Disable AppArmor
- protection for cups on the live CD by switching the profiles to complain
- mode. This is necessary until AppArmor works properly on stacked file
- systems. (LP: #131976)
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Wed, 12 Sep 2007 16:44:02 +0200
-
-casper (1.100) gutsy; urgency=low
-
- * scripts/casper-bottom/41apt_cdrom: Remove unnecessary /root/cdrom
- mounting/unmounting code, which only serves to generate error messages
- (scripts/casper-bottom/05mountpoints handles this already).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 11 Sep 2007 19:47:58 +0100
-
-casper (1.99) gutsy; urgency=low
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Change gconf setting used to automatically start Orca (LP: #131808).
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 31 Aug 2007 13:09:46 +0100
-
-casper (1.98) gutsy; urgency=low
-
- * Load /preseed.cfg if it exists in the initramfs.
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 29 Aug 2007 16:18:27 +0100
-
-casper (1.97) gutsy; urgency=low
-
- * Fix paths in scripts/casper-bottom/10adduser and
- scripts/casper-bottom/38disable_restricted_manager
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 29 Aug 2007 15:26:33 +0100
-
-casper (1.96) gutsy; urgency=low
-
- [ Colin Watson ]
- * Fix name and executability of timezone script.
-
- [ Jonathan Riddell ]
- * In 10adduser add About Kubuntu document to desktop and remove
- restricted-manager autostart files
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 07 Aug 2007 12:51:02 +0100
-
-casper (1.95) gutsy; urgency=low
-
- * Fix regex syntax error while looking for non-CD devices for driver
- updates.
- * Fix ip= boot parameter, documented but not properly merged from Debian.
- (LP: #128689).
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 27 Jul 2007 15:03:41 +0100
-
-casper (1.94) gutsy; urgency=low
-
- [ Colin Watson ]
- * Hack around keyboard configuration not being done until after the keymap
- is set by having /etc/init.d/usplash reconfigure the console
- (LP: #68487).
- * Disable pam_lastlog on the console if doing autologin (LP: #126800).
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Prevent gksu from grabbing keyboard focus for the v2, v3, and m1
- accessibility profiles. (LP: #67172)
- * Start Orca when a Braille device is configured from choosing the
- Braille option in the Accessibility menu. (Partially fixes Launchpad
- bug #122024)
- * Re-enable desktop sounds for the blindness accessibility profile, as
- eSpeak should be able to speak alongside audio playback.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 24 Jul 2007 16:24:55 +0100
-
-casper (1.93) gutsy; urgency=low
-
- * revert gdm-cdd.conf handling for autologin to the chrooted code
- as we had it in feisty. not chrooting brings up problems with the
- alternatives system (dead symlinks) used for gdm-cdd.conf
-
- -- Oliver Grawert <ogra at ubuntu.com> Wed, 18 Jul 2007 15:08:16 +0200
-
-casper (1.92) gutsy; urgency=low
-
- [ Colin Watson ]
- * Don't bother chrooting just to run test(1).
-
- [ Evan Dandrea ]
- * Added support for URL-based preseeding.
- * Added 'noninteractive' option that starts ubiquity in noninteractive
- mode on tty1.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 09 Jul 2007 15:23:51 +0100
-
-casper (1.91) gutsy; urgency=low
-
- * Fix Maintainer field (ubuntu-devel-discuss, not ubuntu-devel).
- * Remember to strip directories from paths when dealing with driver update
- .debs (LP: #120217).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 14 Jun 2007 09:51:33 +0100
-
-casper (1.90) gutsy; urgency=low
-
- * Added to 22screensaver, to stop the screen automatically locking.
- Fixes LP: #13497 for kubuntu as well.
-
- -- Sarah Hobbs <hobbsee at ubuntu.com> Thu, 07 Jun 2007 00:50:42 +1000
-
-casper (1.89) UNRELEASED; urgency=low
-
- * Update Maintainer field to reflect reality; this package is no longer
- maintained by me.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 06 Jun 2007 14:56:46 +0200
-
-casper (1.88) gutsy; urgency=low
-
- * Add default values for root_persistence, home_persistence,
- root_snapshot_label, and home_snapshot_label, and parse the persistent
- command-line option, which went missing in the last merge from Debian.
- This goes some way towards LP #84591 but doesn't quite fix it for me
- since the USB stick inexplicably doesn't appear until a little too late.
- * Use 'losetup -f' instead of walking /sys/block/loop*. Requires
- busybox-initramfs 1:1.1.3-4ubuntu3.
- * Install temporary workaround for /dev/loop* breakage in post-2.6.21
- kernels (LP: #118561).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 04 Jun 2007 16:26:59 +0100
-
-casper (1.87) feisty; urgency=low
-
- [ Colin Watson ]
- * Improve language at end of MD5 check (LP: #100088).
-
- [ Martin Pitt ]
- * Add casper-bottom/33enable_apport_crashes: Enable apport crash
- notifications. They are disabled now by default in the installed system
- for the final release.
-
- -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 9 Apr 2007 14:31:50 +0200
-
-casper (1.86) feisty; urgency=low
-
- [ Luke Yelavich ]
- * scripts/casper-bottom/30accessibility &
- ubiquity-hooks/30accessibility:
- - Point to new settings file for gnome-orca, as package was changed
- from python-support to pycentral. (LP: #91868)
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 5 Apr 2007 16:42:54 +0100
-
-casper (1.85) feisty; urgency=low
-
- * Stop disabling nvidia and fglrx drivers. LP: #94359
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 2 Apr 2007 13:16:46 +0200
-
-casper (1.84) feisty; urgency=low
-
- [ Jani Monoses ]
- * scripts/casper-bottom/13swap: Call /bin/dd not dd so it
- correctly detects and uses existing swap partitions (LP: #62868)
-
- [ Tollef Fog Heen ]
- * Make sure that we are settled before trying to set up netbooting.
- (LP: #96076)
- * Bind-mount /dev too, when configuring X, this should make it easier
- for X to be correctly configured on a lot of systems.
- * Add /root/lib and /root/usr/lib to /etc/ld.so.conf in the initramfs.
- * Add any sources on the CD to APT using apt-cdrom.
- * Set the time zone to UTC. LP: #13782
- * Fix deletion of checkroot script. LP: #66585.
-
- [ Colin Watson ]
- * Fix error message if do_netmount fails (LP: #95134).
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Fri, 30 Mar 2007 12:37:58 +0200
-
-casper (1.83) feisty; urgency=low
-
- * Fix usplash version in Conflicts.
- * Add XS-Vcs-Bzr field to debian/control.
- * scripts/casper-bottom/25configure_init: Support for "respawn COMMAND"
- has been dropped from upstart jobs; cope with /etc/event.d/tty* using
- "respawn" plus "exec COMMAND" now instead (LP: #92928).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 19 Mar 2007 16:44:22 +0000
-
-casper (1.82) feisty; urgency=low
-
- [ Ben Collins ]
- * Depends on eject package, and copy it into initramfs.
- * Add log_wait_msg function to use usplash_write INPUTENTER.
- * Conflict with usplash older than the one that fixes INPUTENTER.
- * Add driver-updates hooks.
-
- [ Colin Watson ]
- * Fix more leftover /live_media wreckage (LP: #84592).
- * Add a ubiquity hook to install driver-updates on the target system.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 5 Mar 2007 11:19:48 +0000
-
-casper (1.81+debian-4) unstable; urgency=low
-
- * Added patch from Serkan Sakar <serkan.sakar at gmx.net> to allow local keymap
- for use with encryption.
-
- -- Daniel Baumann <daniel at debian.org> Wed, 11 Apr 2007 09:04:00 +0200
-
-casper (1.81+debian-3) unstable; urgency=low
-
- * Added depends to eject.
- * Removed recommends to live-package.
-
- -- Daniel Baumann <daniel at debian.org> Wed, 21 Mar 2007 00:30:00 +0100
-
-casper (1.81+debian-2) unstable; urgency=low
-
- [ Daniel Baumann ]
- * Applied patch from Sebastian Raveau <sebastien.raveau at epita.fr> to
- add support for filesystem images encrypted with loop-aes.
-
- [ Marco Amadori ]
- * Added a "quickreboot" boot parameter, that prevent casper to eject the
- media, useful for remote rebooting of a casper system, thanks to
- Jonathan Hall <flimzy at flimzy.com> for the patch.
-
- -- Marco Amadori <marco.amadori at gmail.com> Fri, 16 Feb 2007 17:26:58 +0100
-
-casper (1.81+debian-1) unstable; urgency=low
-
- * New upstream release.
- * Some cleaning and renaming involved because most of the debian-only code
- was merged in ubuntu sources, then back here.
- * Extended manpage, thanks to Alex Owen <r.alex.owen at gmail.com> and
- Jonathan Hall <flimzy at flimzy.com> (Closes: #409980).
- * Included a slightly reworked and bug fixed version of "Allow specific
- ordering of images" by Jonathan Hall <flimzy at flimzy.com> with a new boot
- parameter: module=NAME.
-
- -- Marco Amadori <marco.amadori at gmail.com> Thu, 15 Feb 2007 10:21:01 +0100
-
-casper (1.81) feisty; urgency=low
-
- * Merge in Debian's changes.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 7 Feb 2007 14:39:30 +0100
-
-casper (1.80) feisty; urgency=low
-
- * scripts/casper-bottom/31disable_update_notifier: Allow update-notifier
- to run for crash report handling, but disable its apt-check hook.
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 1 Feb 2007 00:11:06 +0000
-
-casper (1.79+debian-3) unstable; urgency=low
-
- * Fix DEFCONSOLE for autoserial console, thanks to
- "Alex Owen" <r.alex.owen at gmail.com>.
-
- -- Marco Amadori <marco.amadori at gmail.com> Sun, 4 Feb 2007 20:12:08 +0100
-
-casper (1.79+debian-2) unstable; urgency=low
-
- * It now depends also on "file" (Closes: #409308).
- * Fixed LIVEMEDIA_TIMEOUT values (Closes: #409300).
- Thanks for both to Jonathan Hall <flimzy at flimzy.com>.
-
- -- Marco Amadori <marco.amadori at gmail.com> Sat, 3 Feb 2007 18:29:20 +0100
-
-casper (1.79+debian-1) unstable; urgency=low
-
- * New Upstream release.
- * Reverted: "Mount the first squashfs as /rofs."
-
- -- Marco Amadori <marco.amadori at gmail.com> Tue, 16 Jan 2007 12:12:34 +0100
-
-casper (1.79) feisty; urgency=low
-
- [ Colin Watson ]
- * ubiquity-hooks/30accessibility: Change /root to /target in
- kderc_addtoprefixes (thanks, Jani Monoses).
- * Call udevsettle after udevtrigger (thanks, Matthias Urlichs; LP:
- #77438).
- * Send casper-reconfigure error messages to stderr rather than stdout to
- avoid interfering with debconf.
-
- [ Jani Monoses ]
- * ubiquity-hooks/30accessibility, scripts/casper-bottom/30accessibility:
- Fix v2 option to start orca in magnifier not speech mode.
- Add v1, v2, v3, m1 and m2 Xubuntu options
-
- [ Tollef Fog Heen ]
- * Apply patch from Luka Renko to support kde-guidance-powermanager and
- ksmserver instead of klaptoprc as the latter is no longer used.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 10 Jan 2007 20:37:30 +0100
-
-casper (1.78) edgy; urgency=low
-
- * Mount the first squashfs as /rofs. Breaks showmounts and won't work
- properly with stacked filesystems, but works around a kernel oops with
- multiply-mounted squashfses for Edgy.
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 25 Oct 2006 12:46:05 +0100
-
-casper (1.77+debian-7) testing; urgency=medium
-
- * Backported two 1 line fixes (both serious bugs) from casper-1.79+debian-1
- and casper-1.79+debian-3:
- - It now depends also on "file" (Closes: #409308).
- - Fix DEFCONSOLE for autoserial console, thanks to
- "Alex Owen" <r.alex.owen at gmail.com>.
-
- -- Marco Amadori <marco.amadori at gmail.com> Thu, 8 Feb 2007 11:19:46 +0100
-
-casper (1.77+debian-6) unstable; urgency=medium
-
- * Improved snapshots features (even still experimental).
- * Added "live-media-offset=BYTES" boot param, to enable "hiding"
- feature, thanks to Sebastien Raveau <sebastien.raveau at epita.fr>.
- * Now it creates /etc/resolv.conf if netbooted.
-
- -- Marco Amadori <marco.amadori at gmail.com> Fri, 1 Dec 2006 17:43:30 +0100
-
-casper (1.77+debian-5) unstable; urgency=low
-
- * Fixed preseeding locale and keyboard's variant and options.
- * Reorganized scans of /proc/cmdline.
- * Improved manpages, thanks to Oliver Osburg for syntax corrections.
- * Added "nopersistent" boot option to disable the "persistent" boot param.
- * Added "xdebconf" boot option, that uses xdebconfigurator on the
- rootfs to configure X (experimental).
-
- -- Marco Amadori <marco.amadori at gmail.com> Mon, 20 Nov 2006 22:12:18 +0100
-
-casper (1.77+debian-4) unstable; urgency=medium
-
- * Removed -phigh from casper-reconfigure, not needed anymore.
- * Fixed netboot /etc/network/interfaces generation, thanks to Hadar
- <whadar at gmail.com>.
- * Fixed X keyboard setup. Thanks to <ascii_77 at yahoo.fr> for the idea.
- * Fixed keyboard setup.
- * Allow commandline-device to show up late, thanks to Bas Wijnen
- <wijnen at debian.org> for the code and the care (Closes: #397320).
- * Urgency is set to medium to try reaching Etch with important
- features/bugfixes.
-
- -- Marco Amadori <marco.amadori at gmail.com> Mon, 6 Nov 2006 19:00:29 +0100
-
-casper (1.77+debian-3) unstable; urgency=medium
-
- * Fixed "todisk=" parsing.
- * Urgency is set to medium to try reaching Etch with important
- features/bugfixes.
-
- -- Marco Amadori <marco.amadori at gmail.com> Wed, 1 Nov 2006 11:15:56 +0100
-
-casper (1.77+debian-2) unstable; urgency=medium
-
- [ Marco Amadori ]
- * Improved snapshotting (but still experimental).
- * Renamed "host=" boot parameter to "hostname=" and shell variable "HOST" to
- "HOSTNAME" for consistence, with linux and with username/USERNAME, as
- requested by many people.
- * Fixed a "keyb=" typo.
- * Added dependence on lsb-base (used by init-script and
- casper-snapshot).
- * Removed DM support (obsolete).
- * Changed a bit locale and keyboard handling.
- * Fixed locale generation.
- * Urgency is set to medium to try reaching Etch with important
- features/bugfixes.
-
- [ Otavio Salvador ]
- * Really lowered usplash conflicts since Debian doesn't has 0.4.
-
- -- Marco Amadori <marco.amadori at gmail.com> Mon, 30 Oct 2006 17:06:48 +0100
-
-casper (1.77+debian-1) unstable; urgency=low
-
- * New upstream release.
- * Added snapshot persistence feature (copy on boot, sync on reboot) via
- different ways: squashfs, cpio.gz, and block device filesystems.
- * Added boot parameter "live-media=<device>" to force trying to boot from
- a specified device.
- * Added support for "todisk=<device>" to copy the live media to a
- device filesystem, subsequent boots could use "live-media=<device>".
- * Slightly polished locales and keyboards handling.
- * Extendend manpages.
- * Readded a missing "sleep 1", reworked how live_media is detected,
- thanks to Bas Wijnen <wijnen at debian.org> for the reports.
- (Closes: #394308, #394554).
- * Reworked casper-getty system, thanks to Alex Owen (Closes: #394686).
- * Postint now rebuild all initramfs.
- * Casper now Recommends also squashfs-tools and genext2fs, maybe
- needed by casper-snapshot.
- * Lowered usplash requirements, since usplash 0.4 is not in debian
- yet.
-
- -- Marco Amadori <marco.amadori at gmail.com> Sun, 22 Oct 2006 20:25:38 +0200
-
-casper (1.77) edgy; urgency=low
-
- * Honour console-setup/modelcode preseeding. Needed for Malone #66719,
- #66774.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 20 Oct 2006 19:59:39 +0100
-
-casper (1.76) edgy; urgency=low
-
- [ Colin Watson ]
- * Copy access=m2 accessibility changes into the corresponding ubiquity
- hook.
- * Remove spurious quoting from accessibility script.
- * Clear console-setup/layoutcode and console-setup/variantcode if they
- aren't supplied on the command line.
-
- [ Michael Vogt ]
- * scripts/casper-bottom/35fix_language_selector:
- - run fontconfig-voodoo if available to make sure that we have
- optimal fontconfig settings for the CJK languages (lp: #49334)
-
- [ Henrik Nilsen Omma ]
- * Fix a few accessibility items that were out of date, changing
- gnopernicus -> orca and gok -> onboard (the gok entry was missing some
- brackets as well; patch from Malone #58836, closes: Malone #65861).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 16 Oct 2006 20:20:15 +0100
-
-casper (1.75) edgy; urgency=low
-
- * Turn on accessibility in "Motor Difficulties - pointing devices" which
- makes onboard start properly. closes: Malone: #65861.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Fri, 13 Oct 2006 14:12:10 +0200
-
-casper (1.74) edgy; urgency=low
-
- [ Tollef Fog Heen ]
- * Sync up ubiquity-hooks/30accessibility with
- scripts/casper-bottom/30accessibility fixing spelling errors and
- enabling accessibility in KDE.
-
- [ Colin Watson ]
- * Fix check for presence of gconf2 (closes: Malone #58836).
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 11 Oct 2006 11:18:00 +0100
-
-casper (1.73) edgy; urgency=low
-
- * Never run install-keymap or preseed debian-installer/keymap if
- console-setup is detected, even if console-setup wasn't explicitly
- preseeded. Contributes to Malone #60067.
-
- -- Colin Watson <cjwatson at ubuntu.com> Sat, 7 Oct 2006 01:56:20 +0100
-
-casper (1.72) edgy; urgency=low
-
- * Force suspend and hibernate both off, since reconfiguring
- gnome-power-manager kills usplash here. Fixes Malone: #61535
- completely.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Fri, 6 Oct 2006 14:22:23 +0200
-
-casper (1.71+debian-1) unstable; urgency=low
-
- * New upstream release.
- * Added experimental casper-snapshot script and manpage.
- * Tagged for debtags project.
-
- -- Marco Amadori <marco.amadori at gmail.com> Thu, 28 Sep 2006 16:04:54 +0200
-
-casper (1.71) edgy; urgency=low
-
- * Use TEXT-URGENT in shutdown script to make sure we display the "please
- remove disc and press enter" text. Malone: #61533
- * Increase usplash timeout since "TIMEOUT 0" no longer means "spin
- forever".
- * Don't move-mount all the squashfs-es into / since that confuses mono
- (and some other apps too). Malone: #62756
- * Disable kwallet by default. Malone: #47743
- * Add -n to language selector to make it not whine about
- not-fully-installed langpacks. Malone. #37568
- * Override definition of log_end_msg in casper-functions. Make sure all
- casper-bottom scripts use this.
- * Pulsate bar in casper-top and casper-bottom. Malone: #61535
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 4 Oct 2006 09:52:06 +0200
-
-casper (1.70) edgy; urgency=low
-
- * Check for new file= alias as well as preseed/file= (closes: Malone
- #63145).
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 4 Oct 2006 08:59:53 +0100
-
-casper (1.69) edgy; urgency=low
-
- [ Tollef Fog Heen ]
- * Use grep -E in scripts/casper. Malone: #57620
- * Fix syntax error in accessibility script
-
- [ Colin Watson ]
- * Run 'sh -n' over everything in build target to avoid future syntax
- errors.
- * Fix check for /etc/default/console-setup (closes: Malone #62775).
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 2 Oct 2006 10:58:19 +0100
-
-casper (1.68+debian-3) unstable; urgency=low
-
- * Really add casper manpage (Closes: #389867).
- * Lintian cleanness reached.
-
- -- Marco Amadori <marco.amadori at gmail.com> Thu, 28 Sep 2006 12:36:29 +0200
-
-casper (1.68+debian-2) unstable; urgency=low
-
- * Changed "staticip=" boot param to just "ip=".
- * Added a manpage for casper.
- * Lintian cleanings.
-
- -- Marco Amadori <marco.amadori at gmail.com> Tue, 26 Sep 2006 00:45:21 +0200
-
-casper (1.68+debian-1) unstable; urgency=low
-
- * New upstream release.
- * Added static network configuration support.
- * Fixed gnome-screensaver-lock differences between ubuntu.
- * username, host, and userfullname are now also settable
- via kernel parameters.
-
- -- Marco Amadori <marco.amadori at gmail.com> Fri, 8 Sep 2006 11:26:02 +0200
-
-casper (1.68) edgy; urgency=low
-
- * Honour console-setup/layoutcode and console-setup/variantcode preseeding
- (closes: Malone #61573).
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 22 Sep 2006 16:09:53 +0100
-
-casper (1.67) edgy; urgency=low
-
- * Make sure to write xorg.conf md5sum to the installed system, not the
- live system in ubiquity-hooks/20xconfig
- * Implement support for setting KDE's accessibility options too, thanks
- to Jonathan Riddell for the patch.
- * Use usplash's TEXT-URGENT for important messages when doing md5 checks
- * Fix flashing of progress bar on 32 bit arches
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 23 Aug 2006 14:34:57 +0200
-
-casper (1.66+debian-1) unstable; urgency=low
-
- * Added "magic" to make it work seamlessy also on ubuntu systems.
- * Default user password now "live".
-
- -- Marco Amadori <marco.amadori at gmail.com> Fri, 1 Sep 2006 17:18:07 +0200
-
-casper (1.66) edgy; urgency=low
-
- * Fix use of db_get in ubiquity accessibility hook.
- * Use sudo instead of su to get to the live session user from the
- initramfs or to the newly-installed user from ubiquity. su's argument
- handling has changed so that the previous code no longer worked, and su
- was never all that good for arguments containing spaces anyway.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 4 Sep 2006 15:46:55 +0100
-
-casper (1.65+debian-1) unstable; urgency=low
-
- * New upstream release.
- * Re-included ubiquity sources since it is here anyway in diff.gz.
- * Included remote getty patch from Alex Owen (enable it with "casper-getty"
- as kernel parameter).
-
- -- Marco Amadori <marco.amadori at gmail.com> Thu, 17 Aug 2006 14:06:10 +0200
-
-casper (1.65) edgy; urgency=low
-
- * Update to call udevsettle/udevtrigger instead of udevplug
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 21 Aug 2006 19:37:58 +0200
-
-casper (1.64) edgy; urgency=low
-
- * Fix moving of squashfs mount points so that /proc/mounts in the
- installed system refers to them correctly (closes: Malone #55019). As a
- bonus, this lets us mount them on subdirectories of /casper/ right from
- the start.
- * Treat locale= as equivalent to debian-installer/locale= (closes: Malone
- #53444).
- * Fix ubiquity-hooks/30accessibility not to use log_end_msg, and to chroot
- to /target instead of /root (closes: Malone #53277).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 3 Aug 2006 14:00:22 +0100
-
-casper (1.63+debian-3) unstable; urgency=low
-
- * Really do not try to eject cd if netbooted.
- * Fixed unionfs ro param in case of nfs netboot (Closes: 383346).
-
- -- Marco Amadori <marco.amadori at gmail.com> Wed, 16 Aug 2006 20:10:11 +0200
-
-casper (1.63+debian-2) unstable; urgency=low
-
- * Working netboot support (Closes: #380506).
- * Polished kernel parameters parsing a bit.
-
- -- Marco Amadori <marco.amadori at gmail.com> Sun, 13 Aug 2006 15:52:14 +0200
-
-casper (1.63+debian-1) unstable; urgency=low
-
- [Marco Amadori]
- * New upstream release.
- * Fixed upstream changelog.
- * Really fixed the user password issue, now really "debian".
- * Reincluded casper-md5ckeck in debian/rules and 05mountpoints in
- script/casper-bottom.
- * Rewrote netboot support now will support all types of rootfs file images
- (not only plain dirs) like cd/dvd one.
- * Included a fix for USB by Davide Natalini <davide.natalini at studio.unibo.it>
- * Included support for plain directory as RO rootfs.
- * Removed xfs support (not implemented in make-live, maybe useless).
-
- [Alex Owen]
- * Added NFS netboot support (Closes: #380506).
- * Fixed /etc/inittab editing (Closes: #380488).
- * Do not try to eject cd if netbooted (Closes: #380502).
-
- [Daniel Baumann]
- * Minor debian/rules reordering.
- * Changed "Section:" from "admin" to "misc".
-
- -- Marco Amadori <marco.amadori at gmail.com> Sun, 30 Jul 2006 19:10:23 +0200
-
-casper (1.63) edgy; urgency=low
-
- [ Tollef Fog Heen ]
- * Change "Live CD user" to "live session user" in the adduser script.
- Malone #46882
- * Wait for persistent devices for 30 seconds, not 1500.
- * Make sure that readahead-list is installed before chmod -x'ing it.
- * Only disable l-r-m and anacron if they are installed.
- * Make sure laptop-detect is installed before trying to call it.
- * Do not install init script from the initramfs any more. It should
- have rc.d links already in the squashfs.
- * Minor build system fixes.
- * Only copy devmapper relevant files if devmapper is installed.
- * Remove ubuntu-specific branding from the default casper.
- * Install default configuration file and make it end up in the
- initramfs.
- * Get rid of CD references and replace with medium or other appropriate
- terms.
- * Add stacked file system support
-
- [ Marco Amadori ]
- * Added possibility to set locale on chroot, not only at runtime.
- * Updated 14locales to latest debian policy.
-
- [ Malcolm Gilles ]
- * USB devices can have ID_PATH with pci-*-usb, too.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 18 Jul 2006 10:20:51 +0200
-
-casper (1.61+debian-2) unstable; urgency=low
-
- * Set password for user to 'debian'.
-
- -- Daniel Baumann <daniel at debian.org> Wed, 19 Jul 2006 20:56:00 +0200
-
-casper (1.61+debian-1) unstable; urgency=low
-
- [ Daniel Baumann ]
- * Rebuild tarball without debian directory.
- * Using dpatch for upstream modifications.
- * Added patch for proper GDM autologin from Arnaud Cornet
- <arnaud.cornet at gmail.com>.
-
- [ Marco Amadori ]
- * New upstream release (Resynced with 1.61, bzr 258).
- * Usb discover patch from Malcom Gilles <live at ouabain.org>.
-
- -- Marco Amadori <marco.amadori at gmail.com> Tue, 18 Jul 2006 23:34:59 +0200
-
-casper (1.61) edgy; urgency=low
-
- * Move PATH setting to top of casper script to avoid silliness where
- PATH isn't correctly set.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 17 Jul 2006 12:53:59 +0200
-
-casper (1.60) edgy; urgency=low
-
- * Change start symlinks to kill symlinks for anacron, to avoid it being
- started by invoke-rc.d and similar.
- * Rearrange source package.
- * Redo how the init script works and require it to be installed in the
- live fs.
- * Bump version number to be higher than Debian's so we don't
- automatically sync.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 31 May 2006 00:01:40 +0200
-
-casper (1.59+debian-1) unstable; urgency=low
-
- [ Daniel Baumann ]
- * Upload to unstable (Closes: #354539).
-
- [ Marco Amadori ]
- * Added possibility to set locale on chroot, not only at runtime.
- * Removed "persistent" wait.
- * Fixed persistence lock and added "homepersistence" boot parameter.
- * Updated locales handling to latest debian policy.
- * Cleanups
-
- -- Daniel Baumann <daniel at debian.org> Thu, 22 Jun 2006 06:21:00 +0200
-
-casper (1.59+debian-0) UNRELEASED; urgency=low
-
- * Added "toram" boot parameter.
- * Extendend fs support to ext2 and xfs file image.
- * Changed debian-inexistant "-Q" modprobe option with "-q".
- * Removed ubiquity code.
- * USERNAME and HOST defaulted to "debian".
- * Preliminary netboot (cifs) patch by
- "Jason D. Clinton" <me at jasonclinton.com>
- * Lowered dependence of dmsetup code (now only Suggests).
- * Checks for replacing "udevplug" (ubuntu-only) with "udevtrigger".
- * Reworked xorg and anacron patches from
- Frederic Lehobey <Frederic.Lehobey at free.fr>.
- * scripts/casper-bottom/10adduser: configuring only the $USERNAME for sudo
- instead of group 'admin'.
-
- -- Marco Amadori <marco.amadori at gmail.com> Fri, 16 Jun 2006 11:01:48 +0200
-
-casper (1.58) dapper; urgency=low
-
- * Really rename properly, without dirname.
-
- -- Scott James Remnant <scott at ubuntu.com> Tue, 30 May 2006 22:47:04 +0100
-
-casper (1.57) dapper; urgency=low
-
- * Rename the anacron rc.d/S* symlinks to K*, instead of removing them.
- Because otherwise pbbuttonsd decides that starting anacron on the
- LiveCD would be a clever thing to do.
-
- -- Scott James Remnant <scott at ubuntu.com> Wed, 24 May 2006 23:06:04 +0100
-
-casper (1.56) dapper; urgency=low
-
- * Hopefully work a bit better when checking DVDs on 32 bit
- architectures.
- * Do an explicit read from /dev/console when waiting for keypress after
- CD/DVD has been ejected.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 22 May 2006 16:43:03 +0200
-
-casper (1.55) dapper; urgency=low
-
- * Reconfigure gnome-power-manager when doing live installations.
- Malone #45654
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 22 May 2006 11:16:46 +0200
-
-casper (1.54) dapper; urgency=low
-
- [ Luke Yelavich ]
- * Set large print fonts for the v1 accessibility profile. Closes
- Malone #45376.
-
- [ Colin Watson ]
- * Fix preseed/file handling (closes: Malone #43683).
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Thu, 18 May 2006 19:36:24 +0200
-
-casper (1.53) dapper; urgency=low
-
- [ Tollef Fog Heen ]
- * Disable fglrx and nvidida drivers by default. Somewhat addresses
- #43706
-
- [ Colin Watson ]
- * Pass all command-line preseed arguments (other than preseed/file) to
- /root's debconf db.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Sat, 13 May 2006 10:14:36 +0200
-
-casper (1.52) dapper; urgency=low
-
- * Export the path in casper-reconfigure so X and friends actually have
- sbin in their path.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Thu, 11 May 2006 21:04:11 +0200
-
-casper (1.51) dapper; urgency=low
-
- [ Luke Yelavich ]
- * casper-bottom/30accessibility:
- - Removed stale reference to acessx_applet.
- - Fix some typos for gconf values that had to be set as lists.
-
- [ Colin Watson ]
- * Pass debian-installer/locale to /root's debconf db (closes: Malone
- #41896).
- * Identify ourselves as casper when communicating with debconf.
- * Factor out preseeding code into casper-preseed; this knows that it only
- needs to register a question if it fails to set it, which saves memory
- by avoiding debconf having to rewrite templates.dat.
- * Preseed kbd-chooser/method as well as debian-installer/keymap, so that
- kbd-chooser run from ubiquity picks up the selected keyboard (closes:
- Malone #42202).
- * Use new dpkg-reconfigure --no-reload option (debconf 1.4.72ubuntu6) to
- avoid needlessly rewriting templates.dat.
-
- [ Tollef Fog Heen ]
- * Add ... to the end of all usplash messages. Malone #43856
- * Add maybe_break casper-bottom to allow breaking before running bottom
- scripts. Malone #43860
- * Don't show the name of the live cd user that's added.
- * Mount COW filesystem if show-cow is present on the kernel command line.
- Malone #43687
- * Disable the Kubuntu update notifier too. Malone #43806
- * Disable hibernation and enable sleep where appropriate. Malone #23882
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Thu, 11 May 2006 12:11:08 +0200
-
-casper (1.50) dapper; urgency=low
-
- [ Luke Yelavich ]
- * Fixed some typos, and added missing settings to some accessibility
- profiles, as they were either not working properly, or at all. Malone:
- #39472, #39473
- * Removed the desktop wallpaper, and changed the background colour to gray
- for the v1 accessibility profile.
- * Set the whiteglass mouse theme for the v1 accessibility profile.
- * Moved the gconftool-2 -s flag to individual gct calls, to allow for future
- use of gconftool-2 flags that are incompatible with -s.
-
- [ Daniele Favara ]
- * Allow custom HOST, USERNAME, USERFULLNAME. Malone: #42118
- * Add example file
- - debian/casper.dir: Add examples dir
- - debian/casper.conf: Explain briefly how to use new variables
- - debian/rules: Install casper.conf as example_conf_casper
-
- [ Tollef Fog Heen ]
- * Stylistic changes to Daniele's changes.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 2 May 2006 14:12:31 +0200
-
-casper (1.49) dapper; urgency=low
-
- * Also look for hardware named wlan*
-
- -- Scott James Remnant <scott at ubuntu.com> Wed, 26 Apr 2006 13:37:13 +0100
-
-casper (1.48) dapper; urgency=low
-
- * Write /etc/network/interfaces entries for eth0, eth1, eth2, ath0 and
- wlan0 if there's no hardware detected for them; as it may be plugged
- in after boot.
-
- -- Scott James Remnant <scott at ubuntu.com> Wed, 26 Apr 2006 12:31:38 +0100
-
-casper (1.47) dapper; urgency=low
-
- [ Tollef Fog Heen ]
- * Turn on debugging of the X config.
- * Log to a file which gets copied to /var/log/casper.log. Malone: #39895
- * Only pick UTF-8 locales. Malone: #40178
- * Use correct /root rather than /target for seeing what version of
- gnome-panel-data is installed.
- * Make festival (and probably some other apps) happier by using
- 127.0.1.1 for our ubuntu hostname and 127.0.0.1 just resolves to
- "localhost".
- * Make casper-md5check read from tty8 since it wants to get keypresses
- from the active console (where usplash runs). Malone: #40490.
- * Copy /etc/modules when installing with ubiquity. Malone: #40311
- * /etc/gdm/gdm-cdd.conf can be a symlink. Cope with that. Malone: #40767
-
- [ Colin Watson ]
- * ubiquity-casper conflicts/replaces espresso-casper.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 24 Apr 2006 09:41:14 +0200
-
-casper (1.46) dapper; urgency=low
-
- * Use debian-installer/dummy for preseeding rather than espresso/dummy,
- since the latter was removed in espresso 0.99.38.
- * espresso is being renamed to ubiquity. Rename espresso-casper to
- ubiquity-casper to match.
-
- -- Colin Watson <cjwatson at ubuntu.com> Fri, 21 Apr 2006 12:52:48 +0100
-
-casper (1.45) dapper; urgency=low
-
- [ Matt Zimmerman ]
- * [share/shutdown] Disable the usplash timeout and wrap the prompt to two
- lines
-
- [ Tollef Fog Heen ]
- * Use devmapper for ia64, hppa and sparc.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 19 Apr 2006 11:36:49 +0200
-
-casper (1.44) dapper; urgency=low
-
- * Reset the timeout after casper-premount has run so we're sure that the
- timeout is what we want it to be. Udev seems to change it too.
- * Remove a few set -x commands to make the boot slightly less verbose.
- * Fix 10adduser to actually install the correct icons for espresso.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 12 Apr 2006 14:20:53 +0200
-
-casper (1.43) dapper; urgency=low
-
- * Copy espresso-kdeui.desktop file to user's desktop
- Branch at http://kubuntu.org/~jriddell/bzr/casper/trunk/
-
- -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 13 Apr 2006 15:37:49 +0100
-
-casper (1.42) dapper; urgency=low
-
- [ Luke Yelavich ]
- * casper-bottom/30accessibility:
- - Removed some settings from accessibility profiles as these are now
- in the relevant packages.
-
- [ Tollef Fog Heen ]
- * Make sure to call gconftool as the right user. Malone #38408
- * Write an entry for / in fstab. Hopefully fixes Malone #34330
- * Change gdm-cdd.conf if it exists, not gdm.conf. Malone #37467
- * Really disable update-notifier, this time by removing the correct
- file.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 11 Apr 2006 15:43:24 +0200
-
-casper (1.41) dapper; urgency=low
-
- * Don't mkdir then install -D, just install -D (this should prevent
- ~ubuntu/Desktop being owned by root)
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 29 Mar 2006 10:52:42 +0200
-
-casper (1.40) dapper; urgency=low
-
- * Add snd_powermac to /etc/modules on ppc. (Malone: #27862)
- * Use chmod -x instead of mv to disable readahead in order to not
- trigger unionfs bugs
- * Reboot the system when a key is pressed at the end of the integrity
- check. (Malone: #29203)
- * Use usplash_write too when doing shutdown. (Malone: #34537)
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 28 Mar 2006 10:09:49 +0200
-
-casper (1.39) dapper; urgency=low
-
- [ Tollef Fog Heen ]
- * Disable update-notifier by default, as it won't make much sense for
- most people.
-
- [ Colin Watson ]
- * Clear out user-setup questions from the debconf database after creating
- the live CD user, to avoid confusing espresso into offering "Ubuntu
- LiveCD user" as the user's default full name.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 13 Mar 2006 11:38:39 +0100
-
-casper (1.38) dapper; urgency=low
-
- * Disable readahead since it breaks too much with squashfs and unionfs.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Thu, 9 Mar 2006 09:43:39 +0100
-
-casper (1.37) dapper; urgency=low
-
- * Add support for having the squashfs directly on a device, thanks to
- Paul Sladen for idea and a patch.
- * If a directory "Examples" exists in ~ after we've run adduser, move it
- to the Desktop subdirectory for greater visibility.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Sat, 4 Mar 2006 11:55:50 +0100
-
-casper (1.36) dapper; urgency=low
-
- [ Tollef Fog Heen ]
- * Fix typo in find_cow_device so block devices didn't work at all.
- Malone #31639. Thanks to Richard Nemec for the catch.
- * Update accessibility framework, thanks to Luke Yelavich.
-
- [ Colin Watson ]
- * Move the /cdrom mount into the new root filesystem.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 1 Mar 2006 11:13:54 +0100
-
-casper (1.35) dapper; urgency=low
-
- * Check for preseed/file= in /proc/cmdline and feed any given file to
- debconf-set-selections.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 27 Feb 2006 17:32:02 +0000
-
-casper (1.34) dapper; urgency=low
-
- [ Luke Yelavich ]
- * Add initial accessibility support framework
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 22 Feb 2006 14:36:07 +0100
-
-casper (1.33) dapper; urgency=low
-
- * Make sure Desktop and the espresso-$ui.desktop is owned by the Ubuntu
- user. Malone #31991
- * Fix check for rc6.d/S90reboot at the bottom of 25configure_init to
- actually look in the right place.
- * Make me the maintainer of the package.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 20 Feb 2006 09:49:02 +0100
-
-casper (1.32) dapper; urgency=low
-
- * Fix copying of /usr/share/applications/espresso-gtkui.desktop.
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 16 Feb 2006 16:47:15 +0000
-
-casper (1.31) dapper; urgency=low
-
- [ Tollef Fog Heen ]
- * Print message about rebooting the system when the md5 check is
- finished.
- * Just have one copy of the casper shutdown scripts and symlink those
- into the right place. Malone #20978
-
- [ Colin Watson ]
- * Copy /usr/share/applications/espresso-gtkui.desktop to the live CD
- user's desktop.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 14 Feb 2006 14:52:16 +0100
-
-casper (1.30) dapper; urgency=low
-
- * Set a blank password for the ubuntu user. This hopefully resolves
- Malone #30118
- * Pass keyboard layout information to xserver-xorg in the "new" scheme.
- * Set up the right console keymap.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 14 Feb 2006 14:48:14 +0100
-
-casper (1.29) dapper; urgency=low
-
- [ Tollef Fog Heen ]
- * Fix typo in 22gnome_panel_data
- * Configure all detected network interfaces.
- * Add support for putting the persistent storage in a loopback file on
- vfat volumes
- * Configure all detected network interfaces.
- * Allow putting the live filesystem image on a VFAT volume
- * Allow putting the persistent storage in a loopback file on a VFAT
- volume
- * Lots of cleanups
-
- [ Colin Watson ]
- * Change casper-reconfigure to take the target root filesystem as its
- first argument.
- * Add espresso-casper package with hooks to repeat some things done by
- casper in the installed system.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 25 Jan 2006 14:25:45 +0100
-
-casper (1.28) dapper; urgency=low
-
- * Depend on user-setup
- * First shot at IEEE1394 support. Add sbp2 and ohci1394 as modules to
- be copied into the initramfs.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 16 Jan 2006 22:06:35 +0100
-
-casper (1.27) dapper; urgency=low
-
- * Try using unionfs on ppc again
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 10 Jan 2006 20:55:19 +0100
-
-casper (1.26) dapper; urgency=low
-
- * Add persistency support
- * Usplash integration
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 10 Jan 2006 17:53:54 +0100
-
-casper (1.25) dapper; urgency=low
-
- * Make /rofs available to in the target system.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 9 Jan 2006 15:25:12 +0100
-
-casper (1.24) dapper; urgency=low
-
- * For debconf-communicate, use a here-doc rather than trying to have \n
- working in shell variables.
- * The usplash fifo has moved, update paths accordingly. Also conflict
- with the old usplash and depend on new enough initramfs-tools.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Fri, 6 Jan 2006 14:20:37 +0100
-
-casper (1.23) dapper; urgency=low
-
- * Move the building to binary-dep, since we're an arch: any package
- now.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Thu, 5 Jan 2006 10:37:31 +0100
-
-casper (1.22) dapper; urgency=low
-
- * Bunch debconf-communicate commands together to speed up the boot a
- little bit.
- * Add integrity checker, this is compiled code, so casper is now arch:
- any
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Wed, 4 Jan 2006 12:56:13 +0100
-
-casper (1.21) dapper; urgency=low
-
- * If locale is unset, use en_US.UTF8, not whatever comes first in the
- list of supported locales.
- * Generate locale and set the locale in /etc/environment
- * Use user-setup to create the user, rather than doing it ourselves.
- * Various cleanups and fixes, such as making debconf-communicate silent
- * Disable checkroot when booting
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 2 Jan 2006 11:00:25 +0100
-
-casper (1.20) dapper; urgency=low
-
- * Remove a large bunch of debugging output
- * Depend on dmsetup so the hook script can copy in that
- * Handle both squashfs and cloop images, with run-time detection
- * Use devmapper + cloop on powerpc, not unionfs, since unionfs is a
- disaster there.
- * Make sure we have both SCSI and IDE CDROM modules available in the
- initramfs.
- * Do some initial keyboard setup handling so X will, at least in some
- cases, have a chance of giving the user a sane keymap.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Mon, 19 Dec 2005 14:23:13 +0100
-
-casper (1.19) dapper; urgency=low
-
- * Switch to initramfs, so casper only survives in spirit
- * Use unionfs instead of a writeable devmapper snapshot
- * Remove all debconfiscation, since we're an initramfs script now
- * Make the postinst call update-initramfs -u
- * Mount the CD read-only explicitly
- * Make udevinfo silent if the device is not found.
-
- -- Tollef Fog Heen <tfheen at ubuntu.com> Tue, 13 Dec 2005 16:22:45 +0100
-
-casper (1.18) breezy; urgency=low
-
- * Update translations from Rosetta: Greek, Spanish, French, Hungarian,
- Brazilian Portuguese.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 19 Sep 2005 20:05:02 +0100
-
-casper (1.17) breezy; urgency=low
-
- * Set /apps/gnome-screensaver/lock if gnome-screensaver is installed
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 16 Sep 2005 15:24:35 -0700
-
-casper (1.16) breezy; urgency=low
-
- * Install a fake script in /lib/debian-installer.d/S72menu-exit after
- pivoting that just calls sleep, to prevent scary console messages as d-i
- tries to exit without its root filesystem.
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 14 Sep 2005 10:28:06 +0100
-
-casper (1.15) breezy; urgency=low
-
- * Neutralize branding in startup message
- * Use clear in addition to reset, in hopes of concealing error messages on
- the console from d-i's death throes
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 9 Sep 2005 11:24:14 -0700
-
-casper (1.14) breezy; urgency=low
-
- * Set RUNNING_UNDER_GDM=yes in the user's environment to stop xscreensaver
- locking the screen (Ubuntu #7150).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 8 Sep 2005 13:37:00 +0100
-
-casper (1.13) breezy; urgency=low
-
- * Use reset, rather than clear, to clean up after the colored dialogs on vt1
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 7 Sep 2005 16:09:45 -0700
-
-casper (1.12) breezy; urgency=low
-
- * Kill bterm after pivoting so that we can use vt1 rather than vt2,
- thereby avoiding a fight between gdm and the X server (closes: Ubuntu
- #14851).
-
- -- Colin Watson <cjwatson at ubuntu.com> Wed, 7 Sep 2005 15:48:40 +0100
-
-casper (1.11) breezy; urgency=low
-
- * Remove debugging code which crept into 1.10
- * Revert changes to casper-udeb.postinst which were intended for
- starting usplash earlier (pre-1.10)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 2 Sep 2005 13:43:03 -0700
-
-casper (1.10) breezy; urgency=low
-
- * Instead of starting usplash directly, create an init script which will
- start it later (after the new init), to avoid it being killed by
- busybox init
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 29 Aug 2005 20:26:58 -0700
-
-casper (1.9) breezy; urgency=low
-
- * Remember to re-run 30copy-dev from 94usplash, in order to preserve the
- device nodes clobbered by udev
- * Redirect stdin of /etc/init.d/udev from /dev/console, to avoid
- incredibly obnoxious 60-second sleep because it thinks we're
- interactive
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 29 Aug 2005 18:30:38 -0700
-
-casper (1.8) breezy; urgency=low
-
- * Add usplash support
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 29 Aug 2005 17:30:57 -0700
-
-casper (1.7) breezy; urgency=low
-
- * Set DEBUG_XORG_PACKAGE=yes when reconfiguring xserver-xorg. The
- output is only written to post.log and isn't visible to the user, and
- can be invaluable for debugging
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 22 Aug 2005 10:25:38 -0700
-
-casper (1.6) breezy; urgency=low
-
- * Use debconf-copydb again (thanks, Tollef)
- * Rename pre.d/20xconfig to pre.d/20prexconfig so that it is distinct from
- post.d/20xconfig for purposes of the progress bar (no text for it; it's
- very fast)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 17 Aug 2005 14:55:24 -0700
-
-casper (1.5) breezy; urgency=low
-
- * Call MAKEDEV console in post.d/20xconfig as a workaround for bug
- #13523
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 16 Aug 2005 15:24:06 -0700
-
-casper (1.4) breezy; urgency=low
-
- * Revert to the old debconf hack; the debconf-copydb approach needs more
- work
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 15 Aug 2005 22:48:11 -0700
-
-casper (1.3) breezy; urgency=low
-
- * Revert unintentional release of experimental unionfs code in 1.2
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 13 Aug 2005 11:19:50 -0700
-
-casper (1.2) breezy; urgency=low
-
- * Fix debconf-copydb regex in 20xconfig
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 13 Aug 2005 11:07:46 -0700
-
-casper (1.1) breezy; urgency=low
-
- * Cope with xserver-xorg's rename of force_keyboard_detection to
- autodetect_keyboard
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 4 Jul 2005 02:52:07 -0700
-
-casper (1.0) breezy; urgency=low
-
- * Version number bump (we've been through a stable Ubuntu release, after
- all)
- * Rename pre.d/10snapshot to post.d/10filesystem, as it is about to
- become more generic
- * Seed xserver-xorg/force_keyboard_detection to true in 20xconfig, so as
- to cause the keyboard layout to (continue to) be autodetected based on
- d-i settings
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 16 Jun 2005 11:21:54 -0700
-
-casper (0.65) breezy; urgency=low
-
- * As a performance optimization, only reconfigure gnome-panel-data if
- booting on a laptop
- * Disable the "lock screen" menu item (Ubuntu bug#7150)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 8 Jun 2005 16:02:14 -0700
-
-casper (0.64) breezy; urgency=low
-
- * Merge colin.watson at canonical.com--2005/casper--debconf-copydb--0
- - Use debconf-copydb rather than our temporary hack
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 31 May 2005 12:08:51 -0700
-
-casper (0.63) breezy; urgency=low
-
- * Merge colin.watson at canonical.com--2005/casper--cdebconf-info--0
- - Update for cdebconf 0.75: use db_info rather than db_x_setbacktitle.
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 18 Apr 2005 20:59:58 -0700
-
-casper (0.62) hoary; urgency=low
-
- * Updated translations from
- colin.watson at canonical.com--2005/casper--translations--0 (nb)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 5 Apr 2005 09:01:02 -0700
-
-casper (0.61) hoary; urgency=low
-
- * Updated translations from
- colin.watson at canonical.com--2005/casper--translations--0 (el, es, ro)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 5 Apr 2005 08:06:51 -0700
-
-casper (0.60) hoary; urgency=low
-
- * Updated translations from
- colin.watson at canonical.com--2005/casper--translations--0 (hu, id, pl)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 28 Mar 2005 11:26:21 -0800
-
-casper (0.59) hoary; urgency=low
-
- * Updated translations from
- colin.watson at canonical.com--2005/casper--translations--0 (de, pt_BR)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 25 Mar 2005 16:51:17 -0800
-
-casper (0.58) hoary; urgency=low
-
- * Remove postfix shutdown links, as well as startup, to avoid an ugly error
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 24 Mar 2005 18:24:03 -0800
-
-casper (0.57) hoary; urgency=low
-
- * Merge colin.watson at canonical.com--2005/casper--translations--0 up to
- patch-2
- * Preseed netcfg/wireless_essid_again for noninteractive network setup, +new
- in netcfg 1.08ubuntu3 [colin.watson at canonical.com--2005/casper--netcfg--0]
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 23 Mar 2005 08:33:46 -0800
-
-casper (0.56) hoary; urgency=low
-
- * Suppress error output from eject
- * Remind the user to close the CD tray if they have one (Ubuntu #6668)
- * Add arch-build target to debian/rules
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 22 Mar 2005 10:21:41 -0800
-
-casper (0.55) hoary; urgency=low
-
- * Remove the hack introduced in 0.54, xorg 6.8.2-5 should be fixed
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 16 Mar 2005 18:11:05 -0800
-
-casper (0.54) hoary; urgency=low
-
- * Temporarily set RECONFIGURE=true when reconfiguring xserver-xorg, to work
- around a bug introduced in 6.8.2-3
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 16 Mar 2005 15:08:45 -0800
-
-casper (0.53) hoary; urgency=low
-
- * Provide target-base-system (i.e. base system installed in /target, also
- provided by base-installer).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 15 Mar 2005 13:01:53 +0000
-
-casper (0.52) hoary; urgency=low
-
- * Arrange for $LANG to be set after pivot_root, so that (e.g.)
- xserver-xorg can use it to infer the keymap (Ubuntu #7138)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 12 Mar 2005 02:10:59 -0800
-
-casper (0.51) hoary; urgency=low
-
- * Disable kpersonalizer startup on first login
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 5 Mar 2005 13:47:13 -0800
-
-casper (0.50) hoary; urgency=low
-
- * Add support for configuring kdm autologin
- * Rename 15gdm-autologin to 15autologin, and the corresponding debconf template
- * Remove obsolete XORG_FORCE_PROBE from 20xconfig
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 3 Mar 2005 10:37:31 -0800
-
-casper (0.49) hoary; urgency=low
-
- * Fix 20xconfig harder
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 2 Mar 2005 21:20:03 -0800
-
-casper (0.48) hoary; urgency=low
-
- * Source confmodule in 20xconfig
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 2 Mar 2005 21:02:35 -0800
-
-casper (0.47) hoary; urgency=low
-
- * Copy over the value of debian-installer/keymap into the target system,
- to allow the new logic in xserver-xorg.config to work
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 2 Mar 2005 20:45:38 -0800
-
-casper (0.46) hoary; urgency=low
-
- * Lock the live user's password entirely. Since the user is now
- automagically logged in, continuously, both on the console and in X,
- their password is irrelevant.
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 28 Feb 2005 08:31:13 -0800
-
-casper (0.45) hoary; urgency=low
-
- * Enable TimedLogin in gdm, so that if the user logs out, they are
- automatically logged back in after a few seconds (Ubuntu #6667)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sun, 27 Feb 2005 16:06:16 -0800
-
-casper (0.44) hoary; urgency=low
-
- * Configure init to spawn shells on virtual consoles, rather than login
- prompts (Ubuntu #6666)
- * Skip X configuration if a serial console is in use
- * Set the live user's password to be blank, rather than "ubuntu". This
- is, paradoxically, more secure if the user decides to install
- openssh-server, since empty passwords are disallowed by default
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sun, 27 Feb 2005 15:40:15 -0800
-
-casper (0.43) hoary; urgency=low
-
- * Override localechooser progress bar text to be more appropriate for the
- live CD (closes: Ubuntu #6664).
-
- -- Colin Watson <cjwatson at ubuntu.com> Thu, 24 Feb 2005 19:12:00 +0000
-
-casper (0.42) hoary; urgency=low
-
- * Preseed netcfg/no_interfaces, to avoid prompt when no network interfaces
- can be configured (closes: Ubuntu #6107).
- * Remove redundant DH_COMPAT setting in debian/rules, since there's
- already a (different) debian/compat.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 22 Feb 2005 12:43:43 +0000
-
-casper (0.41) hoary; urgency=low
-
- * Cope with change in default /etc/sudoers (admin group).
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 22 Feb 2005 09:14:30 +0000
-
-casper (0.40) hoary; urgency=low
-
- * Copy /dev/tts to the live system as well as /dev/vc, for serial console.
-
- -- Colin Watson <cjwatson at ubuntu.com> Mon, 21 Feb 2005 19:03:54 +0000
-
-casper (0.39) hoary; urgency=low
-
- * Fix reboot operation (cache the reboot binary)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 10 Feb 2005 20:51:08 -0800
-
-casper (0.38) hoary; urgency=low
-
- * Eject the CD during shutdown/reboot
- - Awful hack to copy /dev/cdroms to the live system, because the CD is
- mounted using devfs names
- - Add /usr/share/casper/shutdown script to casper-udeb
- - Copy /usr/share/casper/shutdown to /etc/rc[06].d in 25configure-init
- * Remove caspermon binary package, inadvertently enabled (not even
- remotely ready)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 10 Feb 2005 13:43:56 -0800
-
-casper (0.37) hoary; urgency=low
-
- * Fix casper-udeb/runlevel template
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 8 Feb 2005 19:37:43 -0800
-
-casper (0.36) hoary; urgency=low
-
- * Rename post.d/25disable-init-scripts to 25configure-init
- * Add casper-udeb/runlevel, to allow the default runlevel
- to be set
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 8 Feb 2005 19:14:16 -0800
-
-casper (0.35) hoary; urgency=low
-
- * Preseed netcfg/wireless_essid
- * Remove obsolete confmodule load from pre.d/12fstab
- * Don't mount a tmpfs on /var/run; it doesn't save a huge amount of
- snapshot space, and packages expect their directories there to be
- persistent
-
- -- Matt Zimmerman <mdz at ubuntu.com> Mon, 7 Feb 2005 15:46:52 -0800
-
-casper (0.34) hoary; urgency=low
-
- * Use casper-reconfigure in 10adduser as well
- * Add post.d/93save-logs to save copies of the bootstrap logs to
- /var/log/casper
- * Stop reconfiguring fontconfig; it insists on rebuilding the entire
- font cache, and the only benefit was to unable subpixel hints
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 2 Feb 2005 10:42:19 -0800
-
-casper (0.33) hoary; urgency=low
-
- * Re-upload to fix borked source package
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sun, 30 Jan 2005 12:21:07 -0800
-
-casper (0.32) hoary; urgency=low
-
- * Factor out debconf hackery into casper-reconfigure
- * Mount sysfs earlier, so we don't need to mess with it in 20xconfig
- * Break 22simple-reconfig into 22fontconfig and 22gnome-panel-data, and
- create progress bar text for them
- * Preseed netcfg/dhcp_failed, to avoid a prompt when DHCP fails
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 29 Jan 2005 14:03:36 -0800
-
-casper (0.31) hoary; urgency=low
-
- * Clear tty2 and print a nice message, before signalling init
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 29 Jan 2005 13:15:44 -0800
-
-casper (0.30) hoary; urgency=low
-
- * Reconfigure fontconfig, to enable subpixel rendering based on the
- hardware in use
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 27 Jan 2005 14:21:49 -0800
-
-casper (0.29) hoary; urgency=low
-
- * Fix the problem described in 0.28 by preseeding a default for
- netcfg/get_hostname
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 25 Jan 2005 23:04:03 -0800
-
-casper (0.28) hoary; urgency=low
-
- * Suppress network configuration questions
-
- - The goal is to make a reasonable effort to configure one interface
- automatically, but if that is not possible, fall back to no
- configuration. We aren't quite there yet.
-
- - If we fail to resolve our IP into a hostname using DNS, netcfg seems
- to fall back to an empty value, rather than the default in the
- template.
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 25 Jan 2005 22:55:35 -0800
-
-casper (0.27) hoary; urgency=low
-
- * Add post.d/22simple-reconfig
- - Reconfigure gnome-panel-data if it is installed, to set up the GNOME
- session based on whether the system is a laptop
- - Corresponding progress template
- - mount /proc earlier (needed for, e.g. laptop-detect)
- * Warn about screen blanking in X configuration progress message
- * Simplify post.d/20xconfig and pre.d/13swap a bit
- * Update TODO
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 22 Jan 2005 15:56:49 -0800
-
-casper (0.26) hoary; urgency=low
-
- * Set NOPASSWD in /etc/sudoers for the initial user
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 21 Jan 2005 16:53:49 -0800
-
-casper (0.25) hoary; urgency=low
-
- * mount /proc before signalling init, as it now uses /proc to determine
- what is and is not a kernel thread
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 21 Jan 2005 16:04:52 -0800
-
-casper (0.24) hoary; urgency=low
-
- * Add a backtitle properly
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 21 Jan 2005 09:07:19 -0800
-
-casper (0.23) hoary; urgency=low
-
- * Add a backtitle
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 21 Jan 2005 09:02:01 -0800
-
-casper (0.22) hoary; urgency=low
-
- * Search for swap on SCSI disks as well as IDE
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 19 Jan 2005 14:27:09 -0800
-
-casper (0.21) unstable; urgency=low
-
- * Cosmetic changes to debconf templates
- * Fix 10adduser to register debconf questions before setting their
- values and flags
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 19 Jan 2005 14:14:20 -0800
-
-casper (0.20) hoary; urgency=low
-
- * Remove legacy symlinks from casper/pre.d; they are now contained in
- the relevant udebs
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 19 Jan 2005 13:22:33 -0800
-
-casper (0.19) hoary; urgency=low
-
- * Update TODO
- * casper-udeb Depends: md-modules
-
- -- Matt Zimmerman <mdz at ubuntu.com> Wed, 19 Jan 2005 11:23:51 -0800
-
-casper (0.18) hoary; urgency=low
-
- * Enable new adduser code, using db_fset ... seen to suppress the questions
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 18 Jan 2005 15:06:48 -0800
-
-casper (0.17) hoary; urgency=low
-
- * Convert snapshot setup to use debconf instead of hardcoded parameters
- * Remove obselete-before-being-used username template
- * Convert post.d/10adduser to use debconf passthrough to the passwd package,
- and thus share its user-adding code rather than duplicating it.
- - But don't enable it yet, since we need to find a way to prevent its
- questions from being asked
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 18 Jan 2005 13:04:48 -0800
-
-casper (0.16) hoary; urgency=low
-
- * casper-udeb Depends: casper-check, harddrive-detection
- * Automatically find and enable swap devices
-
- -- Matt Zimmerman <mdz at ubuntu.com> Tue, 18 Jan 2005 11:23:48 -0800
-
-casper (0.15) hoary; urgency=low
-
- * Set anna/standard_modules to false at startup to suppress unnecessary
- udeb retrieval.
-
- -- Colin Watson <cjwatson at ubuntu.com> Tue, 18 Jan 2005 13:41:00 +0000
-
-casper (0.14) hoary; urgency=low
-
- * Enable X autoconfiguration(!)
-
- -- Matt Zimmerman <mdz at ubuntu.com> Sat, 15 Jan 2005 02:19:58 -0800
-
-casper (0.13) hoary; urgency=low
-
- * Rename templates so that they are named after the {pre,post}.d hook
- which uses them
- * Remove some unused templates
-
- -- Matt Zimmerman <mdz at ubuntu.com> Fri, 14 Jan 2005 10:11:02 -0800
-
-casper (0.12) hoary; urgency=low
-
- * Add debconf templates for various things that we currently hardcode.
- Not actually used yet due to need for testing, but having the
- templates present greatly simplifies testing the remaining integration
- work
-
- -- Matt Zimmerman <mdz at ubuntu.com> Thu, 13 Jan 2005 20:32:39 -0800
-
-casper (0.11) hoary; urgency=low
-
- * Update post.d/20xconfig to use debconf passthrough to cdebconf
- (requires debconf 1.4.42 and cdebconf 0.75), but leave it disabled for
- now
- * Create /etc/fstab in the target (this also seems to solve the problem
- with noatime disappearing, and so should reduce snapshot utilization)
-
- -- Matt Zimmerman <mdz at debian.org> Thu, 13 Jan 2005 18:25:36 -0800
-
-casper (0.10) hoary; urgency=low
-
- * Remove rc?.d/K??hwclock.sh links, to avoid changing the system clock
- during reboot or shutdown
-
- -- Matt Zimmerman <mdz at debian.org> Thu, 13 Jan 2005 18:13:31 -0800
-
-casper (0.9) hoary; urgency=low
-
- * Fix gdm autologin configuration (broken in 0.8)
-
- -- Matt Zimmerman <mdz at debian.org> Wed, 12 Jan 2005 10:52:05 -0800
-
-casper (0.8) hoary; urgency=low
-
- * Add debian-installer/casper-udeb/title template, to specify more
- readable menu item text
- * Create /usr/lib/casper/{pre,post}.d and move all of our internal logic
- there
- * Create temporary symlinks in pre.d for the prebaseconfig.d items we
- want
- * Convert errors into proper error dialogs
- * Make some pre.d scripts idempotent, for ease of testing
-
- -- Matt Zimmerman <mdz at debian.org> Tue, 11 Jan 2005 16:59:35 -0800
-
-casper (0.7) hoary; urgency=low
-
- * Disable X configuration temporarily; need to resolve debconf issues
-
- -- Matt Zimmerman <mdz at canonical.com> Tue, 11 Jan 2005 13:14:43 -0800
-
-casper (0.6) hoary; urgency=low
-
- * Allow "modprobe ext2" to fail; apparently it's sometimes compiled in
-
- -- Matt Zimmerman <mdz at debian.org> Tue, 11 Jan 2005 12:12:28 -0800
-
-casper (0.5) hoary; urgency=low
-
- * Attempt to configure X
- - This doesn't work very well yet (PCI BusID doesn't seem to get
- updated, for example), so we still don't start gdm by default)
- * Conditionalize some of the configuration code, so we automatically do
- the right thing if gdm or X isn't installed
- * Add German translation from Andreas Mueller
- * modprobe ext2, to let powerpc work (this should probably happen
- elsewhere, but for now...)
-
- -- Matt Zimmerman <mdz at debian.org> Sun, 9 Jan 2005 17:49:56 -0800
-
-casper (0.4) hoary; urgency=low
-
- * Mount tmpfs on /tmp and /var/run, should save many writes to the snapshot
-
- -- Matt Zimmerman <mdz at debian.org> Fri, 7 Jan 2005 18:35:26 -0800
-
-casper (0.3) hoary; urgency=low
-
- * Disable anacron and postfix startup
- * Don't cripple /bin/apt-install in d-i (this was a workaround to
- prevent d-i from installing packages which should have been present in
- the filesystem image anyway, but weren't)
-
- -- Matt Zimmerman <mdz at debian.org> Fri, 7 Jan 2005 18:10:55 -0800
-
-casper (0.2) hoary; urgency=low
-
- * Use mount --move to move the cdrom mount point, so that we can unmount
- /initrd and free up the memory used by d-i
- * Use /dev/ram1 rather than /dev/ram0 for the COW stuff, since /dev/ram0
- is used for initrds and we want to avoid confusion
- * Organize casper-udeb.postinst into shell functions
- * Add a progress bar
- * Add a debian/compat file (version 4)
-
- -- Matt Zimmerman <mdz at debian.org> Fri, 7 Jan 2005 08:01:21 -0800
-
-casper (0.1) hoary; urgency=low
-
- * Initial Release.
-
- -- Matt Zimmerman <mdz at canonical.com> Wed, 5 Jan 2005 14:30:28 -0800
diff --git a/docs/old/parameters.txt b/docs/old/parameters.txt
deleted file mode 100644
index b1bd6b9..0000000
--- a/docs/old/parameters.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-Boot Parameters for Debian Live
--------------------------------
-
-Updated for live-initramfs 1.156.1-1 on 2009-02-08.
-
-These options (can be combined) work from the bootloader prompt:
-
-live access=ACCESS
-live debug
-live fetch=URL
-live httpfs=URL
-live integrity-check
-live ip=[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF] [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]*
-live ip[=frommedia]
-live iscsi=target-ip[,target-port];target-name
-live {live-media|bootfrom}=DEVICE
-live {live-media-encryption|encryption}=TYPE
-live live-media-offset=BYTES
-live live-media-path=PATH
-live live-media-timeout=SECONDS
-live module=NAME
-live netboot[=nfs|cifs]
-live nfsopts=
-live nofastboot
-live nopersistent
-live swapon
-live persistent[=nofiles]
-live persistent-path=PATH
-live {preseed/file|file}=FILE
-live package/question=VALUE
-live quickreboot
-live showmounts
-live todisk=DEVICE
-live toram
-live union=aufs|unionfs
-
-Values for the vga kernel parameter:
-
-Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200
---------+--------------------------------------------------------------
- 4 bits | ? ? 0x302 ? ? ? ?
- 8 bits | 0x300 0x301 0x303 0x305 0x161 0x307 0x31C
-15 bits | ? 0x310 0x313 0x316 0x162 0x319 0x31D
-16 bits | ? 0x311 0x314 0x317 0x163 0x31A 0x31E
-24 bits | ? 0x312 0x315 0x318 ? 0x31B 0x31F
-32 bits | ? ? ? ? 0x164 ?
-
-Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200
---------+--------------------------------------------------------------
- 4 bits | ? ? 770 ? ? ? ?
- 8 bits | 768 769 771 773 353 775 796
-15 bits | ? 784 787 790 354 793 797
-16 bits | ? 758 788 791 355 794 798
-24 bits | ? 786 789 792 ? 795 799
-32 bits | ? ? ? ? 356 ?
diff --git a/hooks/live b/hooks/live
index b023d4b..40802d0 100755
--- a/hooks/live
+++ b/hooks/live
@@ -32,9 +32,9 @@ then
. /etc/live/boot.conf
fi
-if ls /etc/live/boot.d/* > /dev/null 2>&1
+if ls /etc/live/boot.d/*.conf > /dev/null 2>&1
then
- for _FILE in /etc/live/boot.d/*
+ for _FILE in /etc/live/boot.d/*.conf
do
. ${_FILE}
done
diff --git a/manpages/Makefile b/manpages/Makefile
index 00370bc..fd6298f 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -12,7 +12,7 @@ po4a.cfg:
for MANPAGE in en/*; \
do \
- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
+ SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
echo "[type: man] $${MANPAGE} \$$lang:\$$lang/$$(basename $${MANPAGE} .$${SECTION}).\$$lang.$${SECTION}" >> po4a.cfg; \
done
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 632f85d..2a4ff0e 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-09 3.0~a27\-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
@@ -41,8 +41,8 @@ see below.
.SS "Configuration Files"
\fBlive\-boot\fP can be configured (but not activated) through configuration
files. Those files can be placed either in the root filesystem itself
-(/etc/live/boot.conf, /etc/live/boot.d/), or on the live media
-(live/boot.conf, live/boot.d/).
+(/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media
+(live/boot.conf, live/boot.d/*.conf).
.SH OPTIONS
.\" FIXME
@@ -95,6 +95,10 @@ Target <target\-name>
Lun 0 Path=<path\-to\-your\-live\-image.iso>,Type=fileio,IOMode=ro
# If you want to boot multiple machines you might want to look at tuning some parameters like
# Wthreads or MaxConnections
+.IP \fBfindiso\fP=\fI/PATH/TO/IMAGE\fP 4
+Look for the specified ISO file on all disks where it usually looks for the
+\&.squashfs file (so you don't have to know the device name as in
+fromiso=....).
.IP \fBfromiso\fP=\fI/PATH/TO/IMAGE\fP 4
Allows to use a filesystem from within an iso image that's available on
live\-media.
@@ -157,9 +161,9 @@ This parameter disables the default disabling of filesystem checks in
/etc/fstab. If you have static filesystems on your harddisk and you want
them to be checked at boot time, use this parameter, otherwise they are
skipped.
-.IP \fBnopersistent\fP 4
-disables the "persistent" feature, useful if the bootloader (like syslinux)
-has been installed with persistent enabled.
+.IP \fBnopersistence\fP 4
+disables the "persistence" feature, useful if the bootloader (like syslinux)
+has been installed with persistence enabled.
.IP \fBnoprompt\fP 4
Do not prompt to eject the CD or remove the USB flash drive on reboot.
.IP \fBnoprompt\fP=\fITYPE\fP 4
@@ -172,60 +176,54 @@ 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 4
-live\-boot will probe devices for persistent media. These can be partitions
+.IP \fBpersistence\fP 4
+live\-boot will probe devices for persistence media. These can be partitions
(with the correct GPT name), filesystems (with the correct label) or
image/archive files (with the correct file name). Overlays are labeled/named
either "full\-ov", which will be mounted on /, or "custom\-ov", which can be
-completely customized (see \fIlive.persist\fP(5)); snapshots are labeled/named
-either "live\-sn" or "home\-sn" and will be extracted into / or /home,
-respectively (see \fIlive\-snapshot\fP(1) for more information). The order these
-are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay image files
-and snapshot archive files have extensions which determines their filesystem
-or archive type, e.g. "custom\-ov.ext3" and "\home\-sn.squashfs".
-.IP "\fBpersistent\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+completely customized (see \fIlive\-persistence.conf\fP(5)); snapshots are
+labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or
+/home, respectively (see \fIlive\-snapshot\fP(1) for more information). The
+order these are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay
+image files and snapshot archive files have extensions which determines
+their filesystem or archive type, e.g. "custom\-ov.ext4" and
+"\home\-sn.squashfs".
+.IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
This option determines which types of encryption that we allow to be used
-when probing devices for persistent media. If "none" is in the list, we
+when probing devices for persistence media. If "none" is in the list, we
allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted
media. Whenever a device containing encrypted media is probed the user will
be prompted for the passphrase. The default value is "none".
-.IP \fBpersistent\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
+.IP \fBpersistence\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
If you specify the keyword 'removable', live\-boot will try to find
-persistent and snapshot partitions on removable media only. Note that if you
-want to further restrict the media to usb mass storage only, you can use the
-\&'removable\-usb' keyword.
-.IP "\fBpersistent\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
-This option determines which types of persistent media we allow. If
+persistence and snapshot partitions on removable media only. Note that if
+you want to further restrict the media to usb mass storage only, you can use
+the 'removable\-usb' keyword.
+.IP "\fBpersistence\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistence media we allow. If
"overlay" is in the list, we consider overlays (i.e. "live\-rw" and
"home\-rw"); if "snapshot" is in the list, we consider snapshots
(i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
-.IP \fBpersistent\-path\fP=\fIPATH\fP 4
+.IP \fBpersistence\-path\fP=\fIPATH\fP 4
live\-boot will look for persistency files in the root directory of a
partition, with this parameter, the path can be configured so that you can
have multiple directories on the same partition to store persistency files.
-.IP \fBpersistent\-read\-only\fP 4
-Filesystem changes are not saved back to persistent media. In particular,
+.IP \fBpersistence\-read\-only\fP 4
+Filesystem changes are not saved back to persistence media. In particular,
overlays and netboot NFS mounts are mounted read\-only, and snapshots are not
resynced on shutdown.
-.IP "\fBpersistent\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
-This option determines which types of persistent storage to consider when
-probing for persistent media. If "filesystem" is in the list, filesystems
+.IP "\fBpersistence\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistence storage to consider when
+probing for persistence media. If "filesystem" is in the list, filesystems
with matching labels will be used; if "file" is in the list, all filesystems
will be probed for archives and image files with matching filenames. The
default is "file,filesystem".
-.IP \fBpersistent\-subtext\fP=\fISUFFIX\fP 4
+.IP \fBpersistence\-subtext\fP=\fISUFFIX\fP 4
Add a suffix when searching for the image filenames or partition labels to
-use for the above mentioned persistent feature, the SUFFIX will be added
+use for the above mentioned persistence feature, the SUFFIX will be added
after a dash (e.g.: "live\-sn" would transform to "live\-sn\-SUFFIX"). This is
handy to test multiple live\-boot based live\-systems with different
-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.
-.IP \fBpackage/question\fP=\fIVALUE\fP 4
-All debian installed packages could be preseeded from command\-line that way,
-beware of blanks spaces, they will interfere with parsing, use a preseed
-file in this case.
+persistence storage choices.
.IP \fBquickreboot\fP 4
This option causes live\-boot to reboot without attempting to eject the media
and without asking the user to remove the boot media.
@@ -264,7 +262,7 @@ carriage\-return\-separated file names corresponding to disk images in the
merged into the root aufs, and they will be loaded in the order listed
here. The first entry in this file will be the "lowest" point in the aufs,
and the last file in this list will be on the "top" of the aufs, directly
-below /cow. Without this file, any images in the "/live" directory are
+below /overlay. Without this file, any images in the "/live" directory are
loaded in alphanumeric order.
.IP \fB/etc/live\-persistence.binds\fP 4
This optional file (which resides in the rootfs system, not in the live
@@ -280,15 +278,15 @@ directory with a tmpfs on the original path.
.SH FILES
.IP \fB/etc/live/boot.conf\fP 4
-.IP \fB/etc/live/boot.d/\fP 4
+.IP \fB/etc/live/boot.d/*.conf\fP 4
.IP \fBlive/boot.conf\fP 4
-.IP \fBlive/boot.d/\fP 4
-.IP \fBlive.persist\fP 4
+.IP \fBlive/boot.d/*.conf\fP 4
+.IP \fBlive\-persistence.conf\fP 4
.SH "SEE ALSO"
\fIlive\-snapshot\fP(1)
.PP
-\fIlive.persist\fP(5)
+\fIlive\-persistence.conf\fP(5)
.PP
\fIlive\-build\fP(7)
.PP
diff --git a/manpages/de/live.persist.5.de.persist b/manpages/de/live-persistence.conf.de.5
similarity index 61%
rename from manpages/de/live.persist.5.de.persist
rename to manpages/de/live-persistence.conf.de.5
index 672bb7d..618a965 100644
--- a/manpages/de/live.persist.5.de.persist
+++ b/manpages/de/live-persistence.conf.de.5
@@ -3,27 +3,28 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-04\-09 3.0~a27\-1 "Debian Live Project"
.SH NAME
-\fBlive.persist\fP \- Configuration file for persistent media in live\-boot
+\fBlive\-persistence.conf\fP \- Configuration file for persistence media in
+live\-boot
.SH DESCRIPTION
-If live\-boot probes a persistent volume with the label (or GPT name, or file
-name, but from now on we will just say "label") "custom\-ov", that volume's
-persistence is fully customizable through the \fBlive.persist\fP file stored on
-the root of its file system. Any such labeled volume must have such a file,
-or it will be ignored.
+If live\-boot probes a persistence volume with the label (or GPT name, or
+file name, but from now on we will just say "label") "custom\-ov", that
+volume's persistence is fully customizable through the
+\fBlive\-persistence.conf\fP file stored on the root of its file system. Any
+such labeled volume must have such a file, or it will be ignored.
.PP
-The format of \fBlive.persist\fP allow empty lines and lines starting with a
-"#" (used for comments), both which will be ignored. A so called "custom
-mount" has the format:
+The format of \fBlive\-persistence.conf\fP allow empty lines and lines starting
+with a "#" (used for comments), both which will be ignored. A so called
+"custom mount" has the format:
.PP
.RS
\fIDIR\fP [\fIOPTION\fP]...
.RE
.PP
-which roughly translates to "make \fIDIR\fP persistent in the way described by
+which roughly translates to "make \fIDIR\fP persistence in the way described by
the list of \fIOPTION\fPs".
.PP
For each custom mount \fIDIR\fP must be an absolute path that cannot contain
@@ -31,7 +32,7 @@ white spaces or the special . and .. path components, and cannot be /live
(or any of its sub\-directories), or / (for the latter, use "full\-ov"
persistence instead). Once activated all changes (file deletion, creation
and modification) to \fIDIR\fP on the live file system are stored persistently
-into a path equivalent to \fIDIR\fP on the persistent media, called the source
+into a path equivalent to \fIDIR\fP on the persistence media, called the source
directory. The default way to achieve persistence is to simply bind\-mount
the corresponding source directory to \fIDIR\fP, but this can be changed
through the use of \fIOPTION\fPs.
@@ -39,30 +40,30 @@ through the use of \fIOPTION\fPs.
All custom mounts will be done in an order so that no two custom mounts can
"hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it
would always be the case that /a is mounted first, then /a/b. This remains
-true no matter how the lines in \fBlive.persist\fP are ordered, or if several
-\fBlive.persist\fP files on different persistent media are used at the same
-time. However, it is forbidden for custom mounts to have their source
-directory inside the source directory of another custom mount, so the source
-directories that are auto\-created by live\-boot does not support "nested"
-mounts like /a and /a/b on the same media. In this case you must use the
-\fBsource\fP option (see below) to make sure that they are stored in different
-source directories.
-.PP
-When a source directory doesn't exist on the persistent media for a certain
+true no matter how the lines in \fBlive\-persistence.conf\fP are ordered, or if
+several \fBlive\-persistence.conf\fP files on different persistence media are
+used at the same time. However, it is forbidden for custom mounts to have
+their source directory inside the source directory of another custom mount,
+so the source directories that are auto\-created by live\-boot does not
+support "nested" mounts like /a and /a/b on the same media. In this case you
+must use the \fBsource\fP option (see below) to make sure that they are stored
+in different source directories.
+.PP
+When a source directory doesn't exist on the persistence media for a certain
custom mount, it will be created automatically, and permissions and
ownership will be optimistically set according to \fIDIR\fP. It will also be
bootstrapped by copying the contents of the \fIDIR\fP into its source directory
-on the persistent media. The bootstrapping will not happen when the
-\fBlinkfiles\fP or \fBunion\fP options are used (see below).
+on the persistence media. The bootstrapping will not happen when the \fBlink\fP
+or \fBunion\fP options are used (see below).
.SH OPTIONS
-Custom mounts defined in \fBlive.persist\fP accept the following options in a
-coma\-separated list:
+Custom mounts defined in \fBlive\-persistence.conf\fP accept the following
+options in a coma\-separated list:
.IP \fBsource\fP=\fIPATH\fP 4
-When given, store the persistent changes into \fIPATH\fP on the persistent
-media. \fIPATH\fP must be a relative path (w.r.t. the persistent media root)
+When given, store the persistence changes into \fIPATH\fP on the persistence
+media. \fIPATH\fP must be a relative path (w.r.t. the persistence media root)
that cannot contain white spaces or the special . or .. path components,
-with the exception that it can be just . which means the persistent media
+with the exception that it can be just . which means the persistence media
root. This option is mostly relevant if you want to nest custom mounts,
which otherwise would cause errors, or if you want to make the whole media
root available (similar to the now deprecated \fBhome\-rw\fP type of
@@ -72,8 +73,8 @@ The following options are mutually exclusive (only the last given one will
be in effect):
.IP \fBbind\fP 4
Bind\-mount the source directory to \fIDIR\fP. This is the default.
-.IP \fBlinkfiles\fP 4
-Create the directory structure of the source directory on the persistent
+.IP \fBlink\fP 4
+Create the directory structure of the source directory on the persistence
media in \fIDIR\fP and create symbolic links from the corresponding place in
\fIDIR\fP to each file in the source directory. Existing files or directories
with the same name as any link will be overwritten. Note that deleting the
@@ -81,15 +82,14 @@ links in \fIDIR\fP will only remove the link, not the corresponding file in the
source; removed links will reappear after a reboot. To permanently add or
delete a file one must do so directly in the source directory.
.IP
-Effectively \fBlinkfiles\fP will make only files already in the source
-directory persistent, not any other files in \fIDIR\fP. These files must be
-manually added to the source directory to make use of this option, and they
-will appear in \fIDIR\fP in addition to files already there. This option is
-useful when only certain files need to be persistent, not the whole
-directory they're in, e.g. some configuration files in a user's home
-directory.
+Effectively \fBlink\fP will make only files already in the source directory
+persistent, not any other files in \fIDIR\fP. These files must be manually
+added to the source directory to make use of this option, and they will
+appear in \fIDIR\fP in addition to files already there. This option is useful
+when only certain files need to be persistent, not the whole directory
+they're in, e.g. some configuration files in a user's home directory.
.IP \fBunion\fP 4
-Save the rw branch of a union on the persistent media, so only the changes
+Save the rw branch of a union on the persistence media, so only the changes
are stored persistently. This can potentially reduce disk usage compared to
bind\-mounts, and will not hide files added to the read\-only media. One
caveat is that the union will use \fIDIR\fP from the image's read\-only file
@@ -99,22 +99,23 @@ file system specified by live\-boot's \fBunion\fP boot parameter, but is not
supported with \fBunion=unionmount\fP.
.SH DIRECTORIES
-.IP \fB/live/persistent\fP 4
-All persistent volumes will be mounted here (in a directory corresponding to
-the device name). The \fBlive.persist\fP file can easily be edited through this
-mount, as well as any source directories (which is especially practical for
-custom mounts using the \fBlinkfiles\fP option).
+.IP \fB/live/persistence\fP 4
+All persistence volumes will be mounted here (in a directory corresponding
+to the device name). The \fBlive\-persistence.conf\fP file can easily be edited
+through this mount, as well as any source directories (which is especially
+practical for custom mounts using the \fBlink\fP option).
.SH EXAMPLES
-Let's say we have a persistent volume \fIVOL\fP with the a \fBlive.persist\fP file
-containing the following four lines (numbered for ease of reference):
+Let's say we have a persistence volume \fIVOL\fP with the a
+\fBlive\-persistence.conf\fP file containing the following four lines (numbered
+for ease of reference):
.TP 7
1.
-/home/user1 linkfiles,source=config\-files/user1
+/home/user1 link,source=config\-files/user1
.TP
2.
-/home/user2 linkfiles,source=config\-files/user2
+/home/user2 link,source=config\-files/user2
.TP
3.
/home
@@ -139,7 +140,7 @@ The corresponding source directories are:
\fIVOL\fP/usr
.PP
It was necessary to set the \fBsource\fP options for 1 and 2, since they
-otherwise would become nested with 3's source, which is illegal.
+otherwise would become nested with 3's source, which is invalid.
.PP
Line 3 will be taken care of before line 1 and 2 in order to prevent custom
mounts 1 and 2 from being hidden by 3. When line 3 is handled, \fIVOL\fP/home
@@ -170,11 +171,11 @@ Link:
/home/user2/.ssh/config \-> \fIVOL\fP/config\-files/user2/.ssh/config (from
c)
.PP
-One could argue, though, that lines 1 and 2 in the example \fBlive.persist\fP
-file above are unnecessary since line 3 already would make all of /home
-persistent. The \fBlinkfiles\fP option is intended for situations where you
-don't want a complete directory to be persistent, only certain files in it
-or its sub\-directories.
+One could argue, though, that lines 1 and 2 in the example
+\fBlive\-persistence.conf\fP file above are unnecessary since line 3 already
+would make all of /home persistent. The \fBlink\fP option is intended for
+situations where you don't want a complete directory to be persistent, only
+certain files in it or its sub\-directories.
.PP
Line 4 can be mounted at any time since its \fIDIR\fP (and source directory) is
completely disjoint from all the other custom mounts. When mounted,
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 9b26898..403cc8b 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26\-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-09 3.0~a27\-1 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
@@ -22,20 +22,21 @@
.SH DESCRIPTION
live\-snapshot is a script which can be used to build the right types of
-persistent image files supported by \fIlive\-boot\fP(7). It is also used on exit
-by the live\-boot init script to resync the boot\-found snapshots devices.
+persistence image files supported by \fIlive\-boot\fP(7). It is also used on
+exit by the live\-boot init script to resync the boot\-found snapshots
+devices.
.SH OPTIONS
.IP "\-c, \-\-cow \fIDIRECTORY\fP" 4
specifies the input directory to be cloned in the image file. Its default
-value "/live/cow" should be right for most uses. However it could be handy
-to specify "/home" and type ext2 for the type to prepare an image file
+value "/live/overlay" should be right for most uses. However it could be
+handy to specify "/home" and type ext4 for the type to prepare an image file
suited to be directly mounted by live\-boot as home.
.IP "\-d, \-\-device \fIDEVICE\fP" 4
sets the device where the media which the snapshot/persistence
file/partition will be put. If it is not specified, a tmpfs will be used and
linked to the user's desktop to move it where it is needed. If the device
-has no filesystem, an ext2 fs will be automatically created and labelled
+has no filesystem, an ext4 fs will be automatically created and labelled
according to the values specified after the "\-\-output" value or with a sane
default.
.IP "\-e, \-\-exclude\-list \fIFILE\fP" 4
@@ -71,7 +72,7 @@ carriage\-return\-separated file names corresponding to disk images in the
merged into the root aufs, and they will be loaded in the order listed
here. The first entry in this file will be the "lowest" point in the aufs,
and the last file in this list will be on the "top" of the aufs, directly
-below /cow. Without this file, any images in the "/live" directory are
+below /overlay. Without this file, any images in the "/live" directory are
loaded in alphanumeric order.
.IP \fB/etc/live\-persistence.binds\fP 4
This optional file (which resides in the rootfs system, not in the live
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 946eeb7..75a6ad8 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-04\-09 3.0~a27-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
@@ -23,7 +23,7 @@ To configure the live\-boot parameters used by default in a live image, see the
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.d/*.conf), or on the live media (live/boot.conf, live/boot.d/*.conf).
.SH OPTIONS
\fBlive\-boot\fR currently features the following parameters.
@@ -66,6 +66,8 @@ Target <target-name>
Lun 0 Path=<path-to-your-live-image.iso>,Type=fileio,IOMode=ro
# If you want to boot multiple machines you might want to look at tuning some parameters like
# Wthreads or MaxConnections
+.IP "\fBfindiso\fR=\fI/PATH/TO/IMAGE\fI" 4
+Look for the specified ISO file on all disks where it usually looks for the .squashfs file (so you don't have to know the device name as in fromiso=....).
.IP "\fBfromiso\fR=\fI/PATH/TO/IMAGE\fI" 4
Allows to use a filesystem from within an iso image that's available on live-media.
.IP "\fBignore_uuid\fR" 4
@@ -96,8 +98,8 @@ This tells live\-boot to perform a network mount. The parameter "nfsroot=" (with
This lets you specify custom nfs options.
.IP "\fBnofastboot\fR" 4
This parameter disables the default disabling of filesystem checks in /etc/fstab. If you have static filesystems on your harddisk and you want them to be checked at boot time, use this parameter, otherwise they are skipped.
-.IP "\fBnopersistent\fR" 4
-disables the "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled.
+.IP "\fBnopersistence\fR" 4
+disables the "persistence" feature, useful if the bootloader (like syslinux) has been installed with persistence 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
@@ -106,26 +108,22 @@ This tells live-boot not to prompt to eject the CD (when noprompt=cd) or remove
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" 4
-live\-boot will probe devices for persistent media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive.persist\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext3" and "\home\-sn.squashfs".
-.IP "\fBpersistent\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
-This option determines which types of encryption that we allow to be used when probing devices for persistent media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none".
-.IP "\fBpersistent\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4
-If you specify the keyword 'removable', live\-boot will try to find persistent and snapshot partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword.
-.IP "\fBpersistent\-method\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
-This option determines which types of persistent media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"); if "snapshot" is in the list, we consider snapshots (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
-.IP "\fBpersistent\-path\fR=\fIPATH\fR" 4
+.IP "\fBpersistence\fR" 4
+live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image/archive files (with the correct file name). Overlays are labeled/named either "full\-ov", which will be mounted on /, or "custom\-ov", which can be completely customized (see \fIlive-persistence.conf\fR(5)); snapshots are labeled/named either "live\-sn" or "home\-sn" and will be extracted into / or /home, respectively (see \fIlive\-snapshot\fR(1) for more information). The order these are handled are: full\-ov, custom\-ov, live-sn, home-sn. Overlay image files and snapshot archive files have extensions which determines their filesystem or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs".
+.IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
+This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none".
+.IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4
+If you specify the keyword 'removable', live\-boot will try to find persistence and snapshot partitions on removable media only. Note that if you want to further restrict the media to usb mass storage only, you can use the 'removable\-usb' keyword.
+.IP "\fBpersistence\-method\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
+This option determines which types of persistence media we allow. If "overlay" is in the list, we consider overlays (i.e. "live\-rw" and "home\-rw"); if "snapshot" is in the list, we consider snapshots (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
+.IP "\fBpersistence\-path\fR=\fIPATH\fR" 4
live\-boot will look for persistency files in the root directory of a partition, with this parameter, the path can be configured so that you can have multiple directories on the same partition to store persistency files.
-.IP "\fBpersistent\-read\-only\fR" 4
-Filesystem changes are not saved back to persistent media. In particular, overlays and netboot NFS mounts are mounted read-only, and snapshots are not resynced on shutdown.
-.IP "\fBpersistent\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
-This option determines which types of persistent storage to consider when probing for persistent media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
-.IP "\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
-All debian installed packages could be preseeded from command\-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case.
+.IP "\fBpersistence\-read\-only\fR" 4
+Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only, and snapshots are not resynced on shutdown.
+.IP "\fBpersistence\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
+This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
+.IP "\fBpersistence\-subtext\fR=\fISUFFIX\fR" 4
+Add a suffix when searching for the image filenames or partition labels to use for the above mentioned persistence feature, the SUFFIX will be added after a dash (e.g.: "live-sn" would transform to "live-sn-SUFFIX"). This is handy to test multiple live-boot based live-systems with different persistence storage choices.
.IP "\fBquickreboot\fR" 4
This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media.
.IP "\fBshowmounts\fR" 4
@@ -145,7 +143,7 @@ By default, live\-boot uses aufs. With this parameter, you can switch to unionfs
.IP "\fB/etc/live.conf\fR" 4
Some variables can be configured via this config file (inside the live system).
.IP "\fBlive/filesystem.module\fR" 4
-This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /cow. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
+This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
.IP "\fB/etc/live\-persistence.binds\fR" 4
This optional file (which resides in the rootfs system, not in the live media) is used as a list of directories which not need be persistent: ie. their content does not need to survive reboots when using the persistence features.
.br
@@ -154,15 +152,15 @@ This saves expensive writes and speeds up operations on volatile data such as we
.SH FILES
.IP "\fB/etc/live/boot.conf\fR" 4
-.IP "\fB/etc/live/boot.d/\fR" 4
+.IP "\fB/etc/live/boot.d/*.conf\fR" 4
.IP "\fBlive/boot.conf\fR" 4
-.IP "\fBlive/boot.d/\fR" 4
-.IP "\fBlive.persist\fR" 4
+.IP "\fBlive/boot.d/*.conf\fR" 4
+.IP "\fBlive-persistence.conf\fR" 4
.SH SEE ALSO
\fIlive\-snapshot\fR(1)
.PP
-\fIlive.persist\fR(5)
+\fIlive-persistence.conf\fR(5)
.PP
\fIlive\-build\fR(7)
.PP
diff --git a/manpages/en/live.persist.5 b/manpages/en/live-persistence.conf.5
similarity index 76%
rename from manpages/en/live.persist.5
rename to manpages/en/live-persistence.conf.5
index 615eb7a..96afb50 100644
--- a/manpages/en/live.persist.5
+++ b/manpages/en/live-persistence.conf.5
@@ -1,17 +1,17 @@
-.TH LIVE\-BOOT persist 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-04\-09 3.0~a27-1 "Debian Live Project"
.SH NAME
-\fBlive.persist\fR \- Configuration file for persistent media in
+\fBlive-persistence.conf\fR \- Configuration file for persistence media in
live\-boot
.SH DESCRIPTION
-If live-boot probes a persistent volume with the label (or GPT name,
+If live-boot probes a persistence volume with the label (or GPT name,
or file name, but from now on we will just say "label") "custom\-ov",
that volume's persistence is fully customizable through the
-\fBlive.persist\fR file stored on the root of its file system. Any such
+\fBlive-persistence.conf\fR file stored on the root of its file system. Any such
labeled volume must have such a file, or it will be ignored.
.PP
-The format of \fBlive.persist\fR allow empty lines and lines starting
+The format of \fBlive-persistence.conf\fR allow empty lines and lines starting
with a "#" (used for comments), both which will be ignored. A so
called "custom mount" has the format:
.PP
@@ -19,7 +19,7 @@ called "custom mount" has the format:
\fIDIR\fR [\fIOPTION\fR]...
.RE
.PP
-which roughly translates to "make \fIDIR\fR persistent in the way
+which roughly translates to "make \fIDIR\fR persistence in the way
described by the list of \fIOPTION\fRs".
.PP
For each custom mount \fIDIR\fR must be an absolute path that cannot
@@ -28,7 +28,7 @@ cannot be /live (or any of its sub-directories), or / (for the latter,
use "full-ov" persistence instead). Once activated all changes (file
deletion, creation and modification) to \fIDIR\fR on the live file
system are stored persistently into a path equivalent to \fIDIR\fR on
-the persistent media, called the source directory. The default way to
+the persistence media, called the source directory. The default way to
achieve persistence is to simply bind-mount the corresponding source
directory to \fIDIR\fR, but this can be changed through the use of
\fIOPTION\fRs.
@@ -37,8 +37,8 @@ All custom mounts will be done in an order so that no two custom
mounts can "hide" each other. For instance, if we have the two
\fIDIR\fR:s /a and /a/b it would always be the case that /a is mounted
first, then /a/b. This remains true no matter how the lines in
-\fBlive.persist\fR are ordered, or if several \fBlive.persist\fR files
-on different persistent media are used at the same time. However, it
+\fBlive-persistence.conf\fR are ordered, or if several \fBlive-persistence.conf\fR files
+on different persistence media are used at the same time. However, it
is forbidden for custom mounts to have their source directory inside
the source directory of another custom mount, so the source
directories that are auto-created by live-boot does not support
@@ -46,23 +46,23 @@ directories that are auto-created by live-boot does not support
must use the \fBsource\fR option (see below) to make sure that they
are stored in different source directories.
.PP
-When a source directory doesn't exist on the persistent media for a
+When a source directory doesn't exist on the persistence media for a
certain custom mount, it will be created automatically, and
permissions and ownership will be optimistically set according to
\fIDIR\fR. It will also be bootstrapped by copying the contents of the
-\fIDIR\fR into its source directory on the persistent media. The
-bootstrapping will not happen when the \fBlinkfiles\fR or \fBunion\fR
+\fIDIR\fR into its source directory on the persistence media. The
+bootstrapping will not happen when the \fBlink\fR or \fBunion\fR
options are used (see below).
.SH OPTIONS
-Custom mounts defined in \fBlive.persist\fR accept the following
+Custom mounts defined in \fBlive-persistence.conf\fR accept the following
options in a coma-separated list:
.IP "\fBsource\fR=\fIPATH\fR" 4
-When given, store the persistent changes into \fIPATH\fR on the
-persistent media. \fIPATH\fR must be a relative path (w.r.t. the
-persistent media root) that cannot contain white spaces or the
+When given, store the persistence changes into \fIPATH\fR on the
+persistence media. \fIPATH\fR must be a relative path (w.r.t. the
+persistence media root) that cannot contain white spaces or the
special . or .. path components, with the exception that it can be
-just . which means the persistent media root. This option is mostly
+just . which means the persistence media root. This option is mostly
relevant if you want to nest custom mounts, which otherwise would
cause errors, or if you want to make the whole media root available
(similar to the now deprecated \fBhome-rw\fR type of persistence).
@@ -71,9 +71,9 @@ The following options are mutually exclusive (only the last given one
will be in effect):
.IP "\fBbind\fR" 4
Bind-mount the source directory to \fIDIR\fR. This is the default.
-.IP "\fBlinkfiles\fR" 4
+.IP "\fBlink\fR" 4
Create the directory structure of the source directory on the
-persistent media in \fIDIR\fR and create symbolic links from the
+persistence media in \fIDIR\fR and create symbolic links from the
corresponding place in \fIDIR\fR to each file in the source directory.
Existing files or directories with the same name as any link will be
overwritten. Note that deleting the links in \fIDIR\fR will only
@@ -81,7 +81,7 @@ remove the link, not the corresponding file in the source; removed
links will reappear after a reboot. To permanently add or delete a
file one must do so directly in the source directory.
.IP
-Effectively \fBlinkfiles\fR will make only files already in the source
+Effectively \fBlink\fR will make only files already in the source
directory persistent, not any other files in \fIDIR\fR. These files
must be manually added to the source directory to make use of this
option, and they will appear in \fIDIR\fR in addition to files already
@@ -89,7 +89,7 @@ there. This option is useful when only certain files need to be
persistent, not the whole directory they're in, e.g. some
configuration files in a user's home directory.
.IP "\fBunion\fR" 4
-Save the rw branch of a union on the persistent media, so only the
+Save the rw branch of a union on the persistence media, so only the
changes are stored persistently. This can potentially reduce disk
usage compared to bind-mounts, and will not hide files added to the
read-only media. One caveat is that the union will use \fIDIR\fR from
@@ -100,24 +100,24 @@ live-boot's \fBunion\fR boot parameter, but is not supported with
\fBunion=unionmount\fR.
.SH DIRECTORIES
-.IP "\fB/live/persistent\fR" 4
-All persistent volumes will be mounted here (in a directory
-corresponding to the device name). The \fBlive.persist\fR file can
+.IP "\fB/live/persistence\fR" 4
+All persistence volumes will be mounted here (in a directory
+corresponding to the device name). The \fBlive-persistence.conf\fR file can
easily be edited through this mount, as well as any source directories
(which is especially practical for custom mounts using the
-\fBlinkfiles\fR option).
+\fBlink\fR option).
.SH EXAMPLES
-Let's say we have a persistent volume \fIVOL\fR with the a
-\fBlive.persist\fR file containing the following four lines (numbered
+Let's say we have a persistence volume \fIVOL\fR with the a
+\fBlive-persistence.conf\fR file containing the following four lines (numbered
for ease of reference):
.TP 7
1.
-/home/user1 linkfiles,source=config-files/user1
+/home/user1 link,source=config-files/user1
.TP
2.
-/home/user2 linkfiles,source=config-files/user2
+/home/user2 link,source=config-files/user2
.TP
3.
/home
@@ -142,7 +142,7 @@ without the \fBsource\fR option)
\fIVOL\fR/usr
.PP
It was necessary to set the \fBsource\fR options for 1 and 2, since
-they otherwise would become nested with 3's source, which is illegal.
+they otherwise would become nested with 3's source, which is invalid.
.PP
Line 3 will be taken care of before line 1 and 2 in order to prevent
custom mounts 1 and 2 from being hidden by 3. When line 3 is handled,
@@ -174,8 +174,8 @@ Link:
(from c)
.PP
One could argue, though, that lines 1 and 2 in the example
-\fBlive.persist\fR file above are unnecessary since line 3 already
-would make all of /home persistent. The \fBlinkfiles\fR option is
+\fBlive-persistence.conf\fR file above are unnecessary since line 3 already
+would make all of /home persistent. The \fBlink\fR option is
intended for situations where you don't want a complete directory to
be persistent, only certain files in it or its sub-directories.
.PP
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 0e88a32..2850a63 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2012\-04\-05 3.0~a26-1 "Debian Live Project"
+.TH LIVE\-BOOT 1 2012\-04\-09 3.0~a27-1 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
@@ -15,13 +15,13 @@
\fBlive\-snapshot\fR [\-v|\-\-version]
.SH DESCRIPTION
-live\-snapshot is a script which can be used to build the right types of persistent image files supported by \fIlive\-boot\fR(7). It is also used on exit by the live\-boot init script to resync the boot\-found snapshots devices.
+live\-snapshot is a script which can be used to build the right types of persistence image files supported by \fIlive\-boot\fR(7). It is also used on exit by the live\-boot init script to resync the boot\-found snapshots devices.
.SH OPTIONS
.IP "\-c, \-\-cow \fIDIRECTORY\fR" 4
-specifies the input directory to be cloned in the image file. Its default value "/live/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by live\-boot as home.
+specifies the input directory to be cloned in the image file. Its default value "/live/overlay" should be right for most uses. However it could be handy to specify "/home" and type ext4 for the type to prepare an image file suited to be directly mounted by live\-boot as home.
.IP "\-d, \-\-device \fIDEVICE\fR" 4
-sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "\-\-output" value or with a sane default.
+sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext4 fs will be automatically created and labelled according to the values specified after the "\-\-output" value or with a sane default.
.IP "\-e, \-\-exclude\-list \fIFILE\fR" 4
a file containing a list of filenames/paths that should not be saved. This exclude list will be remebered on the target snapshot media for reuse.
.IP "\-o, \-\-output \fIFILE\fR" 4
@@ -43,7 +43,7 @@ output version information and exit.
.IP "\fB/etc/live.conf\fR" 4
Some variables can be configured via this config file (inside the live system).
.IP "\fBlive/filesystem.module\fR" 4
-This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /cow. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
+This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
.IP "\fB/etc/live\-persistence.binds\fR" 4
This optional file (which resides in the rootfs system, not in the live media) is used as a list of directories which not need be persistent: ie. their content does not need to survive reboots when using the persistence features.
.br
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 1583e8d..21a13ac 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -1,12 +1,13 @@
# German translations for live-boot package
-# 2010-2012 Daniel Baumann <daniel at debian.org>
+# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-boot package.
+# Automatically generated, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a26\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
-"PO-Revision-Date: 2012-04-05 08:11+0300\n"
+"Project-Id-Version: live-boot VERSION\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\n"
+"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -16,31 +17,31 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
#, no-wrap
msgid "NAME"
msgstr ""
@@ -51,7 +52,7 @@ msgid "B<live-boot> - System Boot Scripts"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -132,12 +133,12 @@ msgstr ""
msgid ""
"B<live-boot> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/boot.conf, /etc/live/boot.d/), or on the live media (live/boot.conf, "
-"live/boot.d/)."
+"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
+"conf, live/boot.d/*.conf)."
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -284,24 +285,37 @@ msgstr ""
#. type: IP
#: en/live-boot.7:69
#, no-wrap
-msgid "B<fromiso>=I</PATH/TO/IMAGE>"
+msgid "B<findiso>=I</PATH/TO/IMAGE>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:71
msgid ""
+"Look for the specified ISO file on all disks where it usually looks for the ."
+"squashfs file (so you don't have to know the device name as in fromiso=....)."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:71
+#, no-wrap
+msgid "B<fromiso>=I</PATH/TO/IMAGE>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:73
+msgid ""
"Allows to use a filesystem from within an iso image that's available on live-"
"media."
msgstr ""
#. type: IP
-#: en/live-boot.7:71
+#: en/live-boot.7:73
#, no-wrap
msgid "B<ignore_uuid>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:73
+#: en/live-boot.7:75
msgid ""
"Do not check that any UUID embedded in the initramfs matches the discovered "
"medium. live-boot may be told to generate a UUID by setting "
@@ -309,13 +323,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:73
+#: en/live-boot.7:75
#, no-wrap
msgid "B<integrity-check>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:75
+#: en/live-boot.7:77
msgid ""
"If specified, an MD5 sum is calculated on the live media during boot and "
"compared to the value found in md5sum.txt found in the root directory of the "
@@ -323,13 +337,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:75
+#: en/live-boot.7:77
#, no-wrap
msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:77
+#: en/live-boot.7:79
msgid ""
"Let you specify the name(s) and the options of the interface(s) that should "
"be configured at boot time. Do not specify this if you want to use dhcp "
@@ -339,13 +353,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:77
+#: en/live-boot.7:79
#, no-wrap
msgid "B<ip>=[I<frommedia>]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:79
+#: en/live-boot.7:81
msgid ""
"If this variable is set, dhcp and static configuration are just skipped and "
"the system will use the (must be) media-preconfigured /etc/network/"
@@ -353,13 +367,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:79
+#: en/live-boot.7:81
#, no-wrap
msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:81
+#: en/live-boot.7:83
msgid ""
"If you specify one of this two equivalent forms, live-boot will first try to "
"find this device for the \"/live\" directory where the read-only root "
@@ -368,7 +382,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:83
+#: en/live-boot.7:85
msgid ""
"Instead of specifing an actual device name, the keyword 'removable' can be "
"used to limit the search of acceptable live media to removable type only. "
@@ -377,13 +391,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:83
+#: en/live-boot.7:85
#, no-wrap
msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:85
+#: en/live-boot.7:87
msgid ""
"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -391,13 +405,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:85
+#: en/live-boot.7:87
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:87
+#: en/live-boot.7:89
msgid ""
"This way you could tell live-boot that your image starts at offset BYTES in "
"the above specified or autodiscovered device, this could be useful to hide "
@@ -406,13 +420,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:87
+#: en/live-boot.7:89
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:89
+#: en/live-boot.7:91
msgid ""
"Sets the path to the live filesystem on the medium. By default, it is set to "
"'/live' and you should not change that unless you have customized your media "
@@ -420,26 +434,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:89
+#: en/live-boot.7:91
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:91
+#: en/live-boot.7:93
msgid ""
"Set the timeout in seconds for the device specified by \"live-media=\" to "
"become ready before giving up."
msgstr ""
#. type: IP
-#: en/live-boot.7:91
+#: en/live-boot.7:93
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:93
+#: en/live-boot.7:95
msgid ""
"Instead of using the default optional file \"filesystem.module\" (see below) "
"another file could be specified without the extension \".module\"; it should "
@@ -447,13 +461,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:93
+#: en/live-boot.7:95
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:95
+#: en/live-boot.7:97
msgid ""
"This tells live-boot to perform a network mount. The parameter \"nfsroot="
"\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -461,24 +475,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:95
+#: en/live-boot.7:97
#, no-wrap
msgid "B<nfsopts>="
msgstr ""
#. type: Plain text
-#: en/live-boot.7:97
+#: en/live-boot.7:99
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:97
+#: en/live-boot.7:99
#, no-wrap
msgid "B<nofastboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:99
+#: en/live-boot.7:101
msgid ""
"This parameter disables the default disabling of filesystem checks in /etc/"
"fstab. If you have static filesystems on your harddisk and you want them to "
@@ -486,50 +500,50 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:99
+#: en/live-boot.7:101
#, no-wrap
-msgid "B<nopersistent>"
+msgid "B<nopersistence>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:101
+#: en/live-boot.7:103
msgid ""
-"disables the \"persistent\" feature, useful if the bootloader (like "
-"syslinux) has been installed with persistent enabled."
+"disables the \"persistence\" feature, useful if the bootloader (like "
+"syslinux) has been installed with persistence enabled."
msgstr ""
#. type: IP
-#: en/live-boot.7:101
+#: en/live-boot.7:103
#, no-wrap
msgid "B<noprompt>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:103
+#: en/live-boot.7:105
msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:105
#, no-wrap
msgid "B<noprompt>=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:105
+#: en/live-boot.7:107
msgid ""
"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
"remove the USB flash drive (when noprompt=usb) on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:107
#, no-wrap
msgid "B<ramdisk-size>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:109
msgid ""
"This parameters allows to set a custom ramdisk size (it's the '-o size' "
"option of tmpfs mount). By default, there is no ramdisk size set, so the "
@@ -538,192 +552,165 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:107
+#: en/live-boot.7:109
#, no-wrap
msgid "B<swapon>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:111
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:111
#, no-wrap
-msgid "B<persistent>"
+msgid "B<persistence>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:113
msgid ""
-"live-boot will probe devices for persistent media. These can be partitions "
+"live-boot will probe devices for persistence media. These can be partitions "
"(with the correct GPT name), filesystems (with the correct label) or image/"
"archive files (with the correct file name). Overlays are labeled/named "
"either \"full-ov\", which will be mounted on /, or \"custom-ov\", which can "
-"be completely customized (see I<live.persist>(5)); snapshots are labeled/"
-"named either \"live-sn\" or \"home-sn\" and will be extracted into / or /"
-"home, respectively (see I<live-snapshot>(1) for more information). The order "
-"these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay image "
-"files and snapshot archive files have extensions which determines their "
-"filesystem or archive type, e.g. \"custom-ov.ext3\" and \"\\home-sn.squashfs"
-"\"."
+"be completely customized (see I<live-persistence.conf>(5)); snapshots are "
+"labeled/named either \"live-sn\" or \"home-sn\" and will be extracted into / "
+"or /home, respectively (see I<live-snapshot>(1) for more information). The "
+"order these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay "
+"image files and snapshot archive files have extensions which determines "
+"their filesystem or archive type, e.g. \"custom-ov.ext4\" and \"\\home-sn."
+"squashfs\"."
msgstr ""
#. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:113
#, no-wrap
-msgid "B<persistent-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:115
msgid ""
"This option determines which types of encryption that we allow to be used "
-"when probing devices for persistent media. If \"none\" is in the list, we "
+"when probing devices for persistence media. If \"none\" is in the list, we "
"allow unencrypted media; if \"luks\" is in the list, we allow LUKS-encrypted "
"media. Whenever a device containing encrypted media is probed the user will "
"be prompted for the passphrase. The default value is \"none\"."
msgstr ""
#. type: IP
-#: en/live-boot.7:113
-#, no-wrap
-msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:115
-msgid ""
-"If you specify the keyword 'removable', live-boot will try to find "
-"persistent and snapshot partitions on removable media only. Note that if you "
-"want to further restrict the media to usb mass storage only, you can use the "
-"'removable-usb' keyword."
-msgstr ""
-
-#. type: IP
#: en/live-boot.7:115
#, no-wrap
-msgid "B<persistent-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
msgstr ""
#. type: Plain text
#: en/live-boot.7:117
msgid ""
-"This option determines which types of persistent media we allow. If \"overlay"
-"\" is in the list, we consider overlays (i.e. \"live-rw\" and \"home-rw\"); "
-"if \"snapshot\" is in the list, we consider snapshots (i.e. \"live-sn\" and "
-"\"home-sn\"). The default is \"overlay,snapshot\"."
+"If you specify the keyword 'removable', live-boot will try to find "
+"persistence and snapshot partitions on removable media only. Note that if "
+"you want to further restrict the media to usb mass storage only, you can use "
+"the 'removable-usb' keyword."
msgstr ""
#. type: IP
#: en/live-boot.7:117
#, no-wrap
-msgid "B<persistent-path>=I<PATH>"
+msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:119
msgid ""
-"live-boot will look for persistency files in the root directory of a "
-"partition, with this parameter, the path can be configured so that you can "
-"have multiple directories on the same partition to store persistency files."
+"This option determines which types of persistence media we allow. If "
+"\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
+"\"home-rw\"); if \"snapshot\" is in the list, we consider snapshots (i.e. "
+"\"live-sn\" and \"home-sn\"). The default is \"overlay,snapshot\"."
msgstr ""
#. type: IP
#: en/live-boot.7:119
#, no-wrap
-msgid "B<persistent-read-only>"
+msgid "B<persistence-path>=I<PATH>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:121
msgid ""
-"Filesystem changes are not saved back to persistent media. In particular, "
-"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
-"resynced on shutdown."
+"live-boot will look for persistency files in the root directory of a "
+"partition, with this parameter, the path can be configured so that you can "
+"have multiple directories on the same partition to store persistency files."
msgstr ""
#. type: IP
#: en/live-boot.7:121
#, no-wrap
-msgid "B<persistent-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-read-only>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:123
msgid ""
-"This option determines which types of persistent storage to consider when "
-"probing for persistent media. If \"filesystem\" is in the list, filesystems "
-"with matching labels will be used; if \"file\" is in the list, all "
-"filesystems will be probed for archives and image files with matching "
-"filenames. The default is \"file,filesystem\"."
+"Filesystem changes are not saved back to persistence media. In particular, "
+"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
+"resynced on shutdown."
msgstr ""
#. type: IP
#: en/live-boot.7:123
#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
+msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:125
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."
+"This option determines which types of persistence storage to consider when "
+"probing for persistence media. If \"filesystem\" is in the list, filesystems "
+"with matching labels will be used; if \"file\" is in the list, all "
+"filesystems will be probed for archives and image files with matching "
+"filenames. The default is \"file,filesystem\"."
msgstr ""
#. type: IP
#: en/live-boot.7:125
#, no-wrap
-msgid "{B<preseed/file>|B<file>}=I<FILE>"
+msgid "B<persistence-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:127
msgid ""
-"A path to a file present on the rootfs could be used to preseed debconf "
-"database."
+"Add a suffix when searching for the image filenames or partition labels to "
+"use for the above mentioned persistence feature, the SUFFIX will be added "
+"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
+"is handy to test multiple live-boot based live-systems with different "
+"persistence storage choices."
msgstr ""
#. type: IP
#: en/live-boot.7:127
#, no-wrap
-msgid "B<package/question>=I<VALUE>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:129
-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 "
-"file in this case."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:129
-#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:129
msgid ""
"This option causes live-boot to reboot without attempting to eject the media "
"and without asking the user to remove the boot media."
msgstr ""
#. type: IP
-#: en/live-boot.7:131
+#: en/live-boot.7:129
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:131
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -732,26 +719,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:133
+#: en/live-boot.7:131
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:133
msgid ""
"If you boot with the normal quiet parameter, live-boot hides most messages "
"of its own. When adding silent, it hides all."
msgstr ""
#. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:133
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:137
+#: en/live-boot.7:135
msgid ""
"Adding this parameter, live-boot will try to copy the entire read-only media "
"to the specified device before mounting the root filesystem. It probably "
@@ -761,13 +748,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:135
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:139
+#: en/live-boot.7:137
msgid ""
"Adding this parameter, live-boot will try to copy the whole read-only media "
"to the computer's RAM before mounting the root filesystem. This could need a "
@@ -775,14 +762,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:137
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:142
+#: en/live-boot.7:140
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -790,32 +777,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:144
+#: en/live-boot.7:142
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:43
+#: en/live-boot.7:143 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 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:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 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 \"/"
@@ -823,18 +810,18 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:49
+#: en/live-boot.7:149 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. "
@@ -843,7 +830,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:154 en/live-snapshot.1:51
+#: en/live-boot.7:152 en/live-snapshot.1:51
msgid ""
"This saves expensive writes and speeds up operations on volatile data such "
"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -852,80 +839,80 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:155 en/live-snapshot.1:42
+#: en/live-boot.7:153 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:156
+#: en/live-boot.7:154
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:157
+#: en/live-boot.7:155
#, no-wrap
-msgid "B</etc/live/boot.d/>"
+msgid "B</etc/live/boot.d/*.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:158
+#: en/live-boot.7:156
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:159
+#: en/live-boot.7:157
#, no-wrap
-msgid "B<live/boot.d/>"
+msgid "B<live/boot.d/*.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:160
+#: en/live-boot.7:158
#, no-wrap
-msgid "B<live.persist>"
+msgid "B<live-persistence.conf>"
msgstr ""
#. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:164
+#: en/live-boot.7:162
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:166
-msgid "I<live.persist>(5)"
+#: en/live-boot.7:164
+msgid "I<live-persistence.conf>(5)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 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 "
@@ -933,13 +920,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 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 "
@@ -948,13 +935,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:180 en/live-snapshot.1:70
+#: en/live-boot.7:178 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/po/de/live.persist.5.po b/manpages/po/de/live-persistence.conf.5.po
similarity index 54%
rename from manpages/po/de/live.persist.5.po
rename to manpages/po/de/live-persistence.conf.5.po
index d9981d5..debbc07 100644
--- a/manpages/po/de/live.persist.5.po
+++ b/manpages/po/de/live-persistence.conf.5.po
@@ -1,12 +1,13 @@
# German translations for live-boot package
-# 2010-2012 Daniel Baumann <daniel at debian.org>
+# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-boot package.
+# Automatically generated, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a26-1\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
-"PO-Revision-Date: 2012-04-05 08:11+0300\n"
+"Project-Id-Version: live-boot VERSION\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\n"
+"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -16,76 +17,76 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
#, no-wrap
msgid "NAME"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 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 "
@@ -93,13 +94,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 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 "
@@ -108,107 +109,109 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:6
-msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+#: en/live-persistence.conf.5:6
+msgid ""
+"B<live-persistence.conf> - Configuration file for persistence media in live-"
+"boot"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:13
+#: en/live-persistence.conf.5:13
msgid ""
-"If live-boot probes a persistent volume with the label (or GPT name, or file "
-"name, but from now on we will just say \"label\") \"custom-ov\", that "
-"volume's persistence is fully customizable through the B<live.persist> file "
-"stored on the root of its file system. Any such labeled volume must have "
-"such a file, or it will be ignored."
+"If live-boot probes a persistence volume with the label (or GPT name, or "
+"file name, but from now on we will just say \"label\") \"custom-ov\", that "
+"volume's persistence is fully customizable through the B<live-persistence."
+"conf> file stored on the root of its file system. Any such labeled volume "
+"must have such a file, or it will be ignored."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:17
+#: en/live-persistence.conf.5:17
msgid ""
-"The format of B<live.persist> allow empty lines and lines starting with a \"#"
-"\" (used for comments), both which will be ignored. A so called \"custom "
-"mount\" has the format:"
+"The format of B<live-persistence.conf> allow empty lines and lines starting "
+"with a \"#\" (used for comments), both which will be ignored. A so called "
+"\"custom mount\" has the format:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:20
+#: en/live-persistence.conf.5:20
msgid "I<DIR> [I<OPTION>]..."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:24
+#: en/live-persistence.conf.5:24
msgid ""
-"which roughly translates to \"make I<DIR> persistent in the way described by "
-"the list of I<OPTION>s\"."
+"which roughly translates to \"make I<DIR> persistence in the way described "
+"by the list of I<OPTION>s\"."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:35
+#: en/live-persistence.conf.5:35
msgid ""
"For each custom mount I<DIR> must be an absolute path that cannot contain "
"white spaces or the special . and .. path components, and cannot be /live "
"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
"persistence instead). Once activated all changes (file deletion, creation "
"and modification) to I<DIR> on the live file system are stored persistently "
-"into a path equivalent to I<DIR> on the persistent media, called the source "
+"into a path equivalent to I<DIR> on the persistence media, called the source "
"directory. The default way to achieve persistence is to simply bind-mount "
"the corresponding source directory to I<DIR>, but this can be changed "
"through the use of I<OPTION>s."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:48
+#: en/live-persistence.conf.5:48
msgid ""
"All custom mounts will be done in an order so that no two custom mounts can "
"\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b "
"it would always be the case that /a is mounted first, then /a/b. This "
-"remains true no matter how the lines in B<live.persist> are ordered, or if "
-"several B<live.persist> files on different persistent media are used at the "
-"same time. However, it is forbidden for custom mounts to have their source "
-"directory inside the source directory of another custom mount, so the source "
-"directories that are auto-created by live-boot does not support \"nested\" "
-"mounts like /a and /a/b on the same media. In this case you must use the "
-"B<source> option (see below) to make sure that they are stored in different "
-"source directories."
+"remains true no matter how the lines in B<live-persistence.conf> are "
+"ordered, or if several B<live-persistence.conf> files on different "
+"persistence media are used at the same time. However, it is forbidden for "
+"custom mounts to have their source directory inside the source directory of "
+"another custom mount, so the source directories that are auto-created by "
+"live-boot does not support \"nested\" mounts like /a and /a/b on the same "
+"media. In this case you must use the B<source> option (see below) to make "
+"sure that they are stored in different source directories."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:56
+#: en/live-persistence.conf.5:56
msgid ""
-"When a source directory doesn't exist on the persistent media for a certain "
+"When a source directory doesn't exist on the persistence media for a certain "
"custom mount, it will be created automatically, and permissions and "
"ownership will be optimistically set according to I<DIR>. It will also be "
"bootstrapped by copying the contents of the I<DIR> into its source directory "
-"on the persistent media. The bootstrapping will not happen when the "
-"B<linkfiles> or B<union> options are used (see below)."
+"on the persistence media. The bootstrapping will not happen when the B<link> "
+"or B<union> options are used (see below)."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:60
+#: en/live-persistence.conf.5:60
msgid ""
-"Custom mounts defined in B<live.persist> accept the following options in a "
-"coma-separated list:"
+"Custom mounts defined in B<live-persistence.conf> accept the following "
+"options in a coma-separated list:"
msgstr ""
#. type: IP
-#: en/live.persist.5:60
+#: en/live-persistence.conf.5:60
#, no-wrap
msgid "B<source>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:69
+#: en/live-persistence.conf.5:69
msgid ""
-"When given, store the persistent changes into I<PATH> on the persistent "
-"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"When given, store the persistence changes into I<PATH> on the persistence "
+"media. I<PATH> must be a relative path (w.r.t. the persistence media root) "
"that cannot contain white spaces or the special . or .. path components, "
-"with the exception that it can be just . which means the persistent media "
+"with the exception that it can be just . which means the persistence media "
"root. This option is mostly relevant if you want to nest custom mounts, "
"which otherwise would cause errors, or if you want to make the whole media "
"root available (similar to the now deprecated B<home-rw> type of "
@@ -216,33 +219,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live.persist.5:72
+#: en/live-persistence.conf.5:72
msgid ""
"The following options are mutually exclusive (only the last given one will "
"be in effect):"
msgstr ""
#. type: IP
-#: en/live.persist.5:72
+#: en/live-persistence.conf.5:72
#, no-wrap
msgid "B<bind>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:74
+#: en/live-persistence.conf.5:74
msgid "Bind-mount the source directory to I<DIR>. This is the default."
msgstr ""
#. type: IP
-#: en/live.persist.5:74
+#: en/live-persistence.conf.5:74
#, no-wrap
-msgid "B<linkfiles>"
+msgid "B<link>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:83
+#: en/live-persistence.conf.5:83
msgid ""
-"Create the directory structure of the source directory on the persistent "
+"Create the directory structure of the source directory on the persistence "
"media in I<DIR> and create symbolic links from the corresponding place in "
"I<DIR> to each file in the source directory. Existing files or directories "
"with the same name as any link will be overwritten. Note that deleting the "
@@ -252,27 +255,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live.persist.5:91
+#: en/live-persistence.conf.5:91
msgid ""
-"Effectively B<linkfiles> will make only files already in the source "
-"directory persistent, not any other files in I<DIR>. These files must be "
-"manually added to the source directory to make use of this option, and they "
-"will appear in I<DIR> in addition to files already there. This option is "
-"useful when only certain files need to be persistent, not the whole "
-"directory they're in, e.g. some configuration files in a user's home "
-"directory."
+"Effectively B<link> will make only files already in the source directory "
+"persistent, not any other files in I<DIR>. These files must be manually "
+"added to the source directory to make use of this option, and they will "
+"appear in I<DIR> in addition to files already there. This option is useful "
+"when only certain files need to be persistent, not the whole directory "
+"they're in, e.g. some configuration files in a user's home directory."
msgstr ""
#. type: IP
-#: en/live.persist.5:91
+#: en/live-persistence.conf.5:91
#, no-wrap
msgid "B<union>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:101
+#: en/live-persistence.conf.5:101
msgid ""
-"Save the rw branch of a union on the persistent media, so only the changes "
+"Save the rw branch of a union on the persistence media, so only the changes "
"are stored persistently. This can potentially reduce disk usage compared to "
"bind-mounts, and will not hide files added to the read-only media. One "
"caveat is that the union will use I<DIR> from the image's read-only file "
@@ -283,121 +285,122 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live.persist.5:102
+#: en/live-persistence.conf.5:102
#, no-wrap
msgid "DIRECTORIES"
msgstr ""
#. type: IP
-#: en/live.persist.5:103
+#: en/live-persistence.conf.5:103
#, no-wrap
-msgid "B</live/persistent>"
+msgid "B</live/persistence>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:109
+#: en/live-persistence.conf.5:109
msgid ""
-"All persistent volumes will be mounted here (in a directory corresponding to "
-"the device name). The B<live.persist> file can easily be edited through this "
-"mount, as well as any source directories (which is especially practical for "
-"custom mounts using the B<linkfiles> option)."
+"All persistence volumes will be mounted here (in a directory corresponding "
+"to the device name). The B<live-persistence.conf> file can easily be edited "
+"through this mount, as well as any source directories (which is especially "
+"practical for custom mounts using the B<link> option)."
msgstr ""
#. type: SH
-#: en/live.persist.5:110
+#: en/live-persistence.conf.5:110
#, no-wrap
msgid "EXAMPLES"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:115
+#: en/live-persistence.conf.5:115
msgid ""
-"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
-"containing the following four lines (numbered for ease of reference):"
+"Let's say we have a persistence volume I<VOL> with the a B<live-persistence."
+"conf> file containing the following four lines (numbered for ease of "
+"reference):"
msgstr ""
#. type: TP
-#: en/live.persist.5:115 en/live.persist.5:129
+#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129
#, no-wrap
msgid "1."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:118
-msgid "/home/user1 linkfiles,source=config-files/user1"
+#: en/live-persistence.conf.5:118
+msgid "/home/user1 link,source=config-files/user1"
msgstr ""
#. type: TP
-#: en/live.persist.5:118 en/live.persist.5:133
+#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133
#, no-wrap
msgid "2."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:121
-msgid "/home/user2 linkfiles,source=config-files/user2"
+#: en/live-persistence.conf.5:121
+msgid "/home/user2 link,source=config-files/user2"
msgstr ""
#. type: TP
-#: en/live.persist.5:121 en/live.persist.5:137
+#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137
#, no-wrap
msgid "3."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:124
+#: en/live-persistence.conf.5:124
msgid "/home"
msgstr ""
#. type: TP
-#: en/live.persist.5:124 en/live.persist.5:140
+#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140
#, no-wrap
msgid "4."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:127
+#: en/live-persistence.conf.5:127
msgid "/usr union"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:129
+#: en/live-persistence.conf.5:129
msgid "The corresponding source directories are:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:133
+#: en/live-persistence.conf.5:133
msgid ""
"I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
"B<source> option)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:137
+#: en/live-persistence.conf.5:137
msgid ""
"I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
"B<source> option)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:140
+#: en/live-persistence.conf.5:140
msgid "I<VOL>/home"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:143
+#: en/live-persistence.conf.5:143
msgid "I<VOL>/usr"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:146
+#: en/live-persistence.conf.5:146
msgid ""
"It was necessary to set the B<source> options for 1 and 2, since they "
-"otherwise would become nested with 3's source, which is illegal."
+"otherwise would become nested with 3's source, which is invalid."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:151
+#: en/live-persistence.conf.5:151
msgid ""
"Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
"mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -406,88 +409,89 @@ msgid ""
msgstr ""
#. type: TP
-#: en/live.persist.5:151
+#: en/live-persistence.conf.5:151
#, no-wrap
msgid "a."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:154
+#: en/live-persistence.conf.5:154
msgid "I<VOL>/config-files/user1/.emacs"
msgstr ""
#. type: TP
-#: en/live.persist.5:154
+#: en/live-persistence.conf.5:154
#, no-wrap
msgid "b."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:157
+#: en/live-persistence.conf.5:157
msgid "I<VOL>/config-files/user2/.bashrc"
msgstr ""
#. type: TP
-#: en/live.persist.5:157
+#: en/live-persistence.conf.5:157
#, no-wrap
msgid "c."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:160
+#: en/live-persistence.conf.5:160
msgid "I<VOL>/config-files/user2/.ssh/config"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:162
+#: en/live-persistence.conf.5:162
msgid "Then the following links and directories will be created:"
msgstr ""
#. type: TP
-#: en/live.persist.5:162 en/live.persist.5:165 en/live.persist.5:171
+#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165
+#: en/live-persistence.conf.5:171
#, no-wrap
msgid "Link:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:165
+#: en/live-persistence.conf.5:165
msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:168
+#: en/live-persistence.conf.5:168
msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
msgstr ""
#. type: TP
-#: en/live.persist.5:168
+#: en/live-persistence.conf.5:168
#, no-wrap
msgid "Dir:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:171
+#: en/live-persistence.conf.5:171
msgid "/homea/user2/.ssh (from c)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:175
+#: en/live-persistence.conf.5:175
msgid ""
"/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:181
+#: en/live-persistence.conf.5:181
msgid ""
-"One could argue, though, that lines 1 and 2 in the example B<live.persist> "
-"file above are unnecessary since line 3 already would make all of /home "
-"persistent. The B<linkfiles> option is intended for situations where you "
-"don't want a complete directory to be persistent, only certain files in it "
-"or its sub-directories."
+"One could argue, though, that lines 1 and 2 in the example B<live-"
+"persistence.conf> file above are unnecessary since line 3 already would make "
+"all of /home persistent. The B<link> option is intended for situations where "
+"you don't want a complete directory to be persistent, only certain files in "
+"it or its sub-directories."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:190
+#: en/live-persistence.conf.5:190
msgid ""
"Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
"completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -499,12 +503,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live.persist.5:193
+#: en/live-persistence.conf.5:193
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:213
+#: en/live-persistence.conf.5:213
msgid ""
"live.persist was written by anonym E<lt>I<anonym at lavabit.com>E<gt> for the "
"Debian project."
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 3907d36..10a592e 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -1,12 +1,13 @@
# German translations for live-boot package
-# 2010-2012 Daniel Baumann <daniel at debian.org>
+# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-boot package.
+# Automatically generated, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a26-1\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
-"PO-Revision-Date: 2012-04-05 08:11+0300\n"
+"Project-Id-Version: live-boot VERSION\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\n"
+"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: de\n"
@@ -16,68 +17,68 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
#, no-wrap
msgid "NAME"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:43
+#: en/live-boot.7:143 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 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:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 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 \"/"
@@ -85,18 +86,18 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:49
+#: en/live-boot.7:149 en/live-snapshot.1:49
msgid ""
"This optional file (which resides in the rootfs system, not in the live "
"media) is used as a list of directories which not need be persistent: ie. "
@@ -105,7 +106,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:154 en/live-snapshot.1:51
+#: en/live-boot.7:152 en/live-snapshot.1:51
msgid ""
"This saves expensive writes and speeds up operations on volatile data such "
"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -114,40 +115,40 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:155 en/live-snapshot.1:42
+#: en/live-boot.7:153 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 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 "
@@ -155,13 +156,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 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 "
@@ -170,13 +171,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:180 en/live-snapshot.1:70
+#: en/live-boot.7:178 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
@@ -224,8 +225,8 @@ msgstr ""
#: en/live-snapshot.1:19
msgid ""
"live-snapshot is a script which can be used to build the right types of "
-"persistent image files supported by I<live-boot>(7). It is also used on exit "
-"by the live-boot init script to resync the boot-found snapshots devices."
+"persistence image files supported by I<live-boot>(7). It is also used on "
+"exit by the live-boot init script to resync the boot-found snapshots devices."
msgstr ""
#. type: IP
@@ -238,9 +239,9 @@ msgstr ""
#: en/live-snapshot.1:23
msgid ""
"specifies the input directory to be cloned in the image file. Its default "
-"value \"/live/cow\" should be right for most uses. However it could be handy "
-"to specify \"/home\" and type ext2 for the type to prepare an image file "
-"suited to be directly mounted by live-boot as home."
+"value \"/live/overlay\" should be right for most uses. However it could be "
+"handy to specify \"/home\" and type ext4 for the type to prepare an image "
+"file suited to be directly mounted by live-boot as home."
msgstr ""
#. type: IP
@@ -255,7 +256,7 @@ msgid ""
"sets the device where the media which the snapshot/persistence file/"
"partition will be put. If it is not specified, a tmpfs will be used and "
"linked to the user's desktop to move it where it is needed. If the device "
-"has no filesystem, an ext2 fs will be automatically created and labelled "
+"has no filesystem, an ext4 fs will be automatically created and labelled "
"according to the values specified after the \"--output\" value or with a "
"sane default."
msgstr ""
diff --git a/manpages/po4a.cfg b/manpages/po4a.cfg
index 4d52b0f..1b00187 100644
--- a/manpages/po4a.cfg
+++ b/manpages/po4a.cfg
@@ -1,5 +1,5 @@
[po4a_langs] de
[po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
[type: man] en/live-boot.7 $lang:$lang/live-boot.$lang.7
+[type: man] en/live-persistence.conf.5 $lang:$lang/live-persistence.conf.$lang.5
[type: man] en/live-snapshot.1 $lang:$lang/live-snapshot.$lang.1
-[type: man] en/live.persist.5 $lang:$lang/live.persist.5.$lang.persist
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index a0d0478..35df2f6 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
#, no-wrap
msgid "NAME"
msgstr ""
@@ -52,7 +52,7 @@ msgid "B<live-boot> - System Boot Scripts"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -133,12 +133,12 @@ msgstr ""
msgid ""
"B<live-boot> can be configured (but not activated) through configuration "
"files. Those files can be placed either in the root filesystem itself (/etc/"
-"live/boot.conf, /etc/live/boot.d/), or on the live media (live/boot.conf, "
-"live/boot.d/)."
+"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot."
+"conf, live/boot.d/*.conf)."
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -285,24 +285,37 @@ msgstr ""
#. type: IP
#: en/live-boot.7:69
#, no-wrap
-msgid "B<fromiso>=I</PATH/TO/IMAGE>"
+msgid "B<findiso>=I</PATH/TO/IMAGE>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:71
msgid ""
+"Look for the specified ISO file on all disks where it usually looks for the ."
+"squashfs file (so you don't have to know the device name as in fromiso=....)."
+msgstr ""
+
+#. type: IP
+#: en/live-boot.7:71
+#, no-wrap
+msgid "B<fromiso>=I</PATH/TO/IMAGE>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:73
+msgid ""
"Allows to use a filesystem from within an iso image that's available on live-"
"media."
msgstr ""
#. type: IP
-#: en/live-boot.7:71
+#: en/live-boot.7:73
#, no-wrap
msgid "B<ignore_uuid>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:73
+#: en/live-boot.7:75
msgid ""
"Do not check that any UUID embedded in the initramfs matches the discovered "
"medium. live-boot may be told to generate a UUID by setting "
@@ -310,13 +323,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:73
+#: en/live-boot.7:75
#, no-wrap
msgid "B<integrity-check>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:75
+#: en/live-boot.7:77
msgid ""
"If specified, an MD5 sum is calculated on the live media during boot and "
"compared to the value found in md5sum.txt found in the root directory of the "
@@ -324,13 +337,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:75
+#: en/live-boot.7:77
#, no-wrap
msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:77
+#: en/live-boot.7:79
msgid ""
"Let you specify the name(s) and the options of the interface(s) that should "
"be configured at boot time. Do not specify this if you want to use dhcp "
@@ -340,13 +353,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:77
+#: en/live-boot.7:79
#, no-wrap
msgid "B<ip>=[I<frommedia>]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:79
+#: en/live-boot.7:81
msgid ""
"If this variable is set, dhcp and static configuration are just skipped and "
"the system will use the (must be) media-preconfigured /etc/network/"
@@ -354,13 +367,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:79
+#: en/live-boot.7:81
#, no-wrap
msgid "{B<live-media>|B<bootfrom>}=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:81
+#: en/live-boot.7:83
msgid ""
"If you specify one of this two equivalent forms, live-boot will first try to "
"find this device for the \"/live\" directory where the read-only root "
@@ -369,7 +382,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:83
+#: en/live-boot.7:85
msgid ""
"Instead of specifing an actual device name, the keyword 'removable' can be "
"used to limit the search of acceptable live media to removable type only. "
@@ -378,13 +391,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:83
+#: en/live-boot.7:85
#, no-wrap
msgid "{B<live-media-encryption>|B<encryption>}=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:85
+#: en/live-boot.7:87
msgid ""
"live-boot will mount the encrypted rootfs TYPE, asking the passphrase, "
"useful to build paranoid live systems :-). TYPE supported so far are \"aes\" "
@@ -392,13 +405,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:85
+#: en/live-boot.7:87
#, no-wrap
msgid "B<live-media-offset>=I<BYTES>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:87
+#: en/live-boot.7:89
msgid ""
"This way you could tell live-boot that your image starts at offset BYTES in "
"the above specified or autodiscovered device, this could be useful to hide "
@@ -407,13 +420,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:87
+#: en/live-boot.7:89
#, no-wrap
msgid "B<live-media-path>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:89
+#: en/live-boot.7:91
msgid ""
"Sets the path to the live filesystem on the medium. By default, it is set to "
"'/live' and you should not change that unless you have customized your media "
@@ -421,26 +434,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:89
+#: en/live-boot.7:91
#, no-wrap
msgid "B<live-media-timeout>=I<SECONDS>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:91
+#: en/live-boot.7:93
msgid ""
"Set the timeout in seconds for the device specified by \"live-media=\" to "
"become ready before giving up."
msgstr ""
#. type: IP
-#: en/live-boot.7:91
+#: en/live-boot.7:93
#, no-wrap
msgid "B<module>=I<NAME>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:93
+#: en/live-boot.7:95
msgid ""
"Instead of using the default optional file \"filesystem.module\" (see below) "
"another file could be specified without the extension \".module\"; it should "
@@ -448,13 +461,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:93
+#: en/live-boot.7:95
#, no-wrap
msgid "B<netboot>[=nfs|cifs]"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:95
+#: en/live-boot.7:97
msgid ""
"This tells live-boot to perform a network mount. The parameter \"nfsroot="
"\" (with optional \"nfsopts=\"), should specify where is the location of the "
@@ -462,24 +475,24 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:95
+#: en/live-boot.7:97
#, no-wrap
msgid "B<nfsopts>="
msgstr ""
#. type: Plain text
-#: en/live-boot.7:97
+#: en/live-boot.7:99
msgid "This lets you specify custom nfs options."
msgstr ""
#. type: IP
-#: en/live-boot.7:97
+#: en/live-boot.7:99
#, no-wrap
msgid "B<nofastboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:99
+#: en/live-boot.7:101
msgid ""
"This parameter disables the default disabling of filesystem checks in /etc/"
"fstab. If you have static filesystems on your harddisk and you want them to "
@@ -487,50 +500,50 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:99
+#: en/live-boot.7:101
#, no-wrap
-msgid "B<nopersistent>"
+msgid "B<nopersistence>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:101
+#: en/live-boot.7:103
msgid ""
-"disables the \"persistent\" feature, useful if the bootloader (like "
-"syslinux) has been installed with persistent enabled."
+"disables the \"persistence\" feature, useful if the bootloader (like "
+"syslinux) has been installed with persistence enabled."
msgstr ""
#. type: IP
-#: en/live-boot.7:101
+#: en/live-boot.7:103
#, no-wrap
msgid "B<noprompt>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:103
+#: en/live-boot.7:105
msgid "Do not prompt to eject the CD or remove the USB flash drive on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:105
#, no-wrap
msgid "B<noprompt>=I<TYPE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:105
+#: en/live-boot.7:107
msgid ""
"This tells live-boot not to prompt to eject the CD (when noprompt=cd) or "
"remove the USB flash drive (when noprompt=usb) on reboot."
msgstr ""
#. type: IP
-#: en/live-boot.7:105
+#: en/live-boot.7:107
#, no-wrap
msgid "B<ramdisk-size>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:107
+#: en/live-boot.7:109
msgid ""
"This parameters allows to set a custom ramdisk size (it's the '-o size' "
"option of tmpfs mount). By default, there is no ramdisk size set, so the "
@@ -539,192 +552,165 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:107
+#: en/live-boot.7:109
#, no-wrap
msgid "B<swapon>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:109
+#: en/live-boot.7:111
msgid "This parameter enables usage of local swap partitions."
msgstr ""
#. type: IP
-#: en/live-boot.7:109
+#: en/live-boot.7:111
#, no-wrap
-msgid "B<persistent>"
+msgid "B<persistence>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:111
+#: en/live-boot.7:113
msgid ""
-"live-boot will probe devices for persistent media. These can be partitions "
+"live-boot will probe devices for persistence media. These can be partitions "
"(with the correct GPT name), filesystems (with the correct label) or image/"
"archive files (with the correct file name). Overlays are labeled/named "
"either \"full-ov\", which will be mounted on /, or \"custom-ov\", which can "
-"be completely customized (see I<live.persist>(5)); snapshots are labeled/"
-"named either \"live-sn\" or \"home-sn\" and will be extracted into / or /"
-"home, respectively (see I<live-snapshot>(1) for more information). The order "
-"these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay image "
-"files and snapshot archive files have extensions which determines their "
-"filesystem or archive type, e.g. \"custom-ov.ext3\" and \"\\home-sn.squashfs"
-"\"."
+"be completely customized (see I<live-persistence.conf>(5)); snapshots are "
+"labeled/named either \"live-sn\" or \"home-sn\" and will be extracted into / "
+"or /home, respectively (see I<live-snapshot>(1) for more information). The "
+"order these are handled are: full-ov, custom-ov, live-sn, home-sn. Overlay "
+"image files and snapshot archive files have extensions which determines "
+"their filesystem or archive type, e.g. \"custom-ov.ext4\" and \"\\home-sn."
+"squashfs\"."
msgstr ""
#. type: IP
-#: en/live-boot.7:111
+#: en/live-boot.7:113
#, no-wrap
-msgid "B<persistent-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-encryption>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:113
+#: en/live-boot.7:115
msgid ""
"This option determines which types of encryption that we allow to be used "
-"when probing devices for persistent media. If \"none\" is in the list, we "
+"when probing devices for persistence media. If \"none\" is in the list, we "
"allow unencrypted media; if \"luks\" is in the list, we allow LUKS-encrypted "
"media. Whenever a device containing encrypted media is probed the user will "
"be prompted for the passphrase. The default value is \"none\"."
msgstr ""
#. type: IP
-#: en/live-boot.7:113
-#, no-wrap
-msgid "B<persistent-media>={I<removable>|I<removable-usb>}"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:115
-msgid ""
-"If you specify the keyword 'removable', live-boot will try to find "
-"persistent and snapshot partitions on removable media only. Note that if you "
-"want to further restrict the media to usb mass storage only, you can use the "
-"'removable-usb' keyword."
-msgstr ""
-
-#. type: IP
#: en/live-boot.7:115
#, no-wrap
-msgid "B<persistent-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-media>={I<removable>|I<removable-usb>}"
msgstr ""
#. type: Plain text
#: en/live-boot.7:117
msgid ""
-"This option determines which types of persistent media we allow. If \"overlay"
-"\" is in the list, we consider overlays (i.e. \"live-rw\" and \"home-rw\"); "
-"if \"snapshot\" is in the list, we consider snapshots (i.e. \"live-sn\" and "
-"\"home-sn\"). The default is \"overlay,snapshot\"."
+"If you specify the keyword 'removable', live-boot will try to find "
+"persistence and snapshot partitions on removable media only. Note that if "
+"you want to further restrict the media to usb mass storage only, you can use "
+"the 'removable-usb' keyword."
msgstr ""
#. type: IP
#: en/live-boot.7:117
#, no-wrap
-msgid "B<persistent-path>=I<PATH>"
+msgid "B<persistence-method>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:119
msgid ""
-"live-boot will look for persistency files in the root directory of a "
-"partition, with this parameter, the path can be configured so that you can "
-"have multiple directories on the same partition to store persistency files."
+"This option determines which types of persistence media we allow. If "
+"\"overlay\" is in the list, we consider overlays (i.e. \"live-rw\" and "
+"\"home-rw\"); if \"snapshot\" is in the list, we consider snapshots (i.e. "
+"\"live-sn\" and \"home-sn\"). The default is \"overlay,snapshot\"."
msgstr ""
#. type: IP
#: en/live-boot.7:119
#, no-wrap
-msgid "B<persistent-read-only>"
+msgid "B<persistence-path>=I<PATH>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:121
msgid ""
-"Filesystem changes are not saved back to persistent media. In particular, "
-"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
-"resynced on shutdown."
+"live-boot will look for persistency files in the root directory of a "
+"partition, with this parameter, the path can be configured so that you can "
+"have multiple directories on the same partition to store persistency files."
msgstr ""
#. type: IP
#: en/live-boot.7:121
#, no-wrap
-msgid "B<persistent-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
+msgid "B<persistence-read-only>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:123
msgid ""
-"This option determines which types of persistent storage to consider when "
-"probing for persistent media. If \"filesystem\" is in the list, filesystems "
-"with matching labels will be used; if \"file\" is in the list, all "
-"filesystems will be probed for archives and image files with matching "
-"filenames. The default is \"file,filesystem\"."
+"Filesystem changes are not saved back to persistence media. In particular, "
+"overlays and netboot NFS mounts are mounted read-only, and snapshots are not "
+"resynced on shutdown."
msgstr ""
#. type: IP
#: en/live-boot.7:123
#, no-wrap
-msgid "B<persistent-subtext>=I<SUFFIX>"
+msgid "B<persistence-storage>=I<TYPE1>,I<TYPE2> ... I<TYPEn>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:125
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."
+"This option determines which types of persistence storage to consider when "
+"probing for persistence media. If \"filesystem\" is in the list, filesystems "
+"with matching labels will be used; if \"file\" is in the list, all "
+"filesystems will be probed for archives and image files with matching "
+"filenames. The default is \"file,filesystem\"."
msgstr ""
#. type: IP
#: en/live-boot.7:125
#, no-wrap
-msgid "{B<preseed/file>|B<file>}=I<FILE>"
+msgid "B<persistence-subtext>=I<SUFFIX>"
msgstr ""
#. type: Plain text
#: en/live-boot.7:127
msgid ""
-"A path to a file present on the rootfs could be used to preseed debconf "
-"database."
+"Add a suffix when searching for the image filenames or partition labels to "
+"use for the above mentioned persistence feature, the SUFFIX will be added "
+"after a dash (e.g.: \"live-sn\" would transform to \"live-sn-SUFFIX\"). This "
+"is handy to test multiple live-boot based live-systems with different "
+"persistence storage choices."
msgstr ""
#. type: IP
#: en/live-boot.7:127
#, no-wrap
-msgid "B<package/question>=I<VALUE>"
-msgstr ""
-
-#. type: Plain text
-#: en/live-boot.7:129
-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 "
-"file in this case."
-msgstr ""
-
-#. type: IP
-#: en/live-boot.7:129
-#, no-wrap
msgid "B<quickreboot>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:131
+#: en/live-boot.7:129
msgid ""
"This option causes live-boot to reboot without attempting to eject the media "
"and without asking the user to remove the boot media."
msgstr ""
#. type: IP
-#: en/live-boot.7:131
+#: en/live-boot.7:129
#, no-wrap
msgid "B<showmounts>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:133
+#: en/live-boot.7:131
msgid ""
"This parameter will make live-boot to show on \"/\" the ro filesystems "
"(mostly compressed) on \"/live\". This is not enabled by default because "
@@ -733,26 +719,26 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:133
+#: en/live-boot.7:131
#, no-wrap
msgid "B<silent>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:135
+#: en/live-boot.7:133
msgid ""
"If you boot with the normal quiet parameter, live-boot hides most messages "
"of its own. When adding silent, it hides all."
msgstr ""
#. type: IP
-#: en/live-boot.7:135
+#: en/live-boot.7:133
#, no-wrap
msgid "B<todisk>=I<DEVICE>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:137
+#: en/live-boot.7:135
msgid ""
"Adding this parameter, live-boot will try to copy the entire read-only media "
"to the specified device before mounting the root filesystem. It probably "
@@ -762,13 +748,13 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:137
+#: en/live-boot.7:135
#, no-wrap
msgid "B<toram>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:139
+#: en/live-boot.7:137
msgid ""
"Adding this parameter, live-boot will try to copy the whole read-only media "
"to the computer's RAM before mounting the root filesystem. This could need a "
@@ -776,14 +762,14 @@ msgid ""
msgstr ""
#. type: IP
-#: en/live-boot.7:139
+#: en/live-boot.7:137
#, no-wrap
msgid "B<union>=aufs|unionfs"
msgstr ""
#. FIXME
#. type: Plain text
-#: en/live-boot.7:142
+#: en/live-boot.7:140
msgid ""
"By default, live-boot uses aufs. With this parameter, you can switch to "
"unionfs."
@@ -791,32 +777,32 @@ msgstr ""
#. FIXME
#. type: SH
-#: en/live-boot.7:144
+#: en/live-boot.7:142
#, no-wrap
msgid "FILES (old)"
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:43
+#: en/live-boot.7:143 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 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:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 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 \"/"
@@ -824,18 +810,18 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:49
+#: en/live-boot.7:149 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. "
@@ -844,7 +830,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:154 en/live-snapshot.1:51
+#: en/live-boot.7:152 en/live-snapshot.1:51
msgid ""
"This saves expensive writes and speeds up operations on volatile data such "
"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -853,80 +839,80 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:155 en/live-snapshot.1:42
+#: en/live-boot.7:153 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: IP
-#: en/live-boot.7:156
+#: en/live-boot.7:154
#, no-wrap
msgid "B</etc/live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:157
+#: en/live-boot.7:155
#, no-wrap
-msgid "B</etc/live/boot.d/>"
+msgid "B</etc/live/boot.d/*.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:158
+#: en/live-boot.7:156
#, no-wrap
msgid "B<live/boot.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:159
+#: en/live-boot.7:157
#, no-wrap
-msgid "B<live/boot.d/>"
+msgid "B<live/boot.d/*.conf>"
msgstr ""
#. type: IP
-#: en/live-boot.7:160
+#: en/live-boot.7:158
#, no-wrap
-msgid "B<live.persist>"
+msgid "B<live-persistence.conf>"
msgstr ""
#. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:164
+#: en/live-boot.7:162
msgid "I<live-snapshot>(1)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:166
-msgid "I<live.persist>(5)"
+#: en/live-boot.7:164
+msgid "I<live-persistence.conf>(5)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 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 "
@@ -934,13 +920,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 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 "
@@ -949,13 +935,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:180 en/live-snapshot.1:70
+#: en/live-boot.7:178 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
diff --git a/manpages/pot/live.persist.5.pot b/manpages/pot/live-persistence.conf.5.pot
similarity index 55%
rename from manpages/pot/live.persist.5.pot
rename to manpages/pot/live-persistence.conf.5.pot
index b0e4919..44a1e25 100644
--- a/manpages/pot/live.persist.5.pot
+++ b/manpages/pot/live-persistence.conf.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,76 +17,76 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
#, no-wrap
msgid "NAME"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 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 "
@@ -94,13 +94,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 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 "
@@ -109,107 +109,109 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:6
-msgid "B<live.persist> - Configuration file for persistent media in live-boot"
+#: en/live-persistence.conf.5:6
+msgid ""
+"B<live-persistence.conf> - Configuration file for persistence media in live-"
+"boot"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:13
+#: en/live-persistence.conf.5:13
msgid ""
-"If live-boot probes a persistent volume with the label (or GPT name, or file "
-"name, but from now on we will just say \"label\") \"custom-ov\", that "
-"volume's persistence is fully customizable through the B<live.persist> file "
-"stored on the root of its file system. Any such labeled volume must have "
-"such a file, or it will be ignored."
+"If live-boot probes a persistence volume with the label (or GPT name, or "
+"file name, but from now on we will just say \"label\") \"custom-ov\", that "
+"volume's persistence is fully customizable through the B<live-persistence."
+"conf> file stored on the root of its file system. Any such labeled volume "
+"must have such a file, or it will be ignored."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:17
+#: en/live-persistence.conf.5:17
msgid ""
-"The format of B<live.persist> allow empty lines and lines starting with a \"#"
-"\" (used for comments), both which will be ignored. A so called \"custom "
-"mount\" has the format:"
+"The format of B<live-persistence.conf> allow empty lines and lines starting "
+"with a \"#\" (used for comments), both which will be ignored. A so called "
+"\"custom mount\" has the format:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:20
+#: en/live-persistence.conf.5:20
msgid "I<DIR> [I<OPTION>]..."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:24
+#: en/live-persistence.conf.5:24
msgid ""
-"which roughly translates to \"make I<DIR> persistent in the way described by "
-"the list of I<OPTION>s\"."
+"which roughly translates to \"make I<DIR> persistence in the way described "
+"by the list of I<OPTION>s\"."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:35
+#: en/live-persistence.conf.5:35
msgid ""
"For each custom mount I<DIR> must be an absolute path that cannot contain "
"white spaces or the special . and .. path components, and cannot be /live "
"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
"persistence instead). Once activated all changes (file deletion, creation "
"and modification) to I<DIR> on the live file system are stored persistently "
-"into a path equivalent to I<DIR> on the persistent media, called the source "
+"into a path equivalent to I<DIR> on the persistence media, called the source "
"directory. The default way to achieve persistence is to simply bind-mount "
"the corresponding source directory to I<DIR>, but this can be changed "
"through the use of I<OPTION>s."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:48
+#: en/live-persistence.conf.5:48
msgid ""
"All custom mounts will be done in an order so that no two custom mounts can "
"\"hide\" each other. For instance, if we have the two I<DIR>:s /a and /a/b "
"it would always be the case that /a is mounted first, then /a/b. This "
-"remains true no matter how the lines in B<live.persist> are ordered, or if "
-"several B<live.persist> files on different persistent media are used at the "
-"same time. However, it is forbidden for custom mounts to have their source "
-"directory inside the source directory of another custom mount, so the source "
-"directories that are auto-created by live-boot does not support \"nested\" "
-"mounts like /a and /a/b on the same media. In this case you must use the "
-"B<source> option (see below) to make sure that they are stored in different "
-"source directories."
+"remains true no matter how the lines in B<live-persistence.conf> are "
+"ordered, or if several B<live-persistence.conf> files on different "
+"persistence media are used at the same time. However, it is forbidden for "
+"custom mounts to have their source directory inside the source directory of "
+"another custom mount, so the source directories that are auto-created by "
+"live-boot does not support \"nested\" mounts like /a and /a/b on the same "
+"media. In this case you must use the B<source> option (see below) to make "
+"sure that they are stored in different source directories."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:56
+#: en/live-persistence.conf.5:56
msgid ""
-"When a source directory doesn't exist on the persistent media for a certain "
+"When a source directory doesn't exist on the persistence media for a certain "
"custom mount, it will be created automatically, and permissions and "
"ownership will be optimistically set according to I<DIR>. It will also be "
"bootstrapped by copying the contents of the I<DIR> into its source directory "
-"on the persistent media. The bootstrapping will not happen when the "
-"B<linkfiles> or B<union> options are used (see below)."
+"on the persistence media. The bootstrapping will not happen when the B<link> "
+"or B<union> options are used (see below)."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:60
+#: en/live-persistence.conf.5:60
msgid ""
-"Custom mounts defined in B<live.persist> accept the following options in a "
-"coma-separated list:"
+"Custom mounts defined in B<live-persistence.conf> accept the following "
+"options in a coma-separated list:"
msgstr ""
#. type: IP
-#: en/live.persist.5:60
+#: en/live-persistence.conf.5:60
#, no-wrap
msgid "B<source>=I<PATH>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:69
+#: en/live-persistence.conf.5:69
msgid ""
-"When given, store the persistent changes into I<PATH> on the persistent "
-"media. I<PATH> must be a relative path (w.r.t. the persistent media root) "
+"When given, store the persistence changes into I<PATH> on the persistence "
+"media. I<PATH> must be a relative path (w.r.t. the persistence media root) "
"that cannot contain white spaces or the special . or .. path components, "
-"with the exception that it can be just . which means the persistent media "
+"with the exception that it can be just . which means the persistence media "
"root. This option is mostly relevant if you want to nest custom mounts, "
"which otherwise would cause errors, or if you want to make the whole media "
"root available (similar to the now deprecated B<home-rw> type of "
@@ -217,33 +219,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live.persist.5:72
+#: en/live-persistence.conf.5:72
msgid ""
"The following options are mutually exclusive (only the last given one will "
"be in effect):"
msgstr ""
#. type: IP
-#: en/live.persist.5:72
+#: en/live-persistence.conf.5:72
#, no-wrap
msgid "B<bind>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:74
+#: en/live-persistence.conf.5:74
msgid "Bind-mount the source directory to I<DIR>. This is the default."
msgstr ""
#. type: IP
-#: en/live.persist.5:74
+#: en/live-persistence.conf.5:74
#, no-wrap
-msgid "B<linkfiles>"
+msgid "B<link>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:83
+#: en/live-persistence.conf.5:83
msgid ""
-"Create the directory structure of the source directory on the persistent "
+"Create the directory structure of the source directory on the persistence "
"media in I<DIR> and create symbolic links from the corresponding place in "
"I<DIR> to each file in the source directory. Existing files or directories "
"with the same name as any link will be overwritten. Note that deleting the "
@@ -253,27 +255,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live.persist.5:91
+#: en/live-persistence.conf.5:91
msgid ""
-"Effectively B<linkfiles> will make only files already in the source "
-"directory persistent, not any other files in I<DIR>. These files must be "
-"manually added to the source directory to make use of this option, and they "
-"will appear in I<DIR> in addition to files already there. This option is "
-"useful when only certain files need to be persistent, not the whole "
-"directory they're in, e.g. some configuration files in a user's home "
-"directory."
+"Effectively B<link> will make only files already in the source directory "
+"persistent, not any other files in I<DIR>. These files must be manually "
+"added to the source directory to make use of this option, and they will "
+"appear in I<DIR> in addition to files already there. This option is useful "
+"when only certain files need to be persistent, not the whole directory "
+"they're in, e.g. some configuration files in a user's home directory."
msgstr ""
#. type: IP
-#: en/live.persist.5:91
+#: en/live-persistence.conf.5:91
#, no-wrap
msgid "B<union>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:101
+#: en/live-persistence.conf.5:101
msgid ""
-"Save the rw branch of a union on the persistent media, so only the changes "
+"Save the rw branch of a union on the persistence media, so only the changes "
"are stored persistently. This can potentially reduce disk usage compared to "
"bind-mounts, and will not hide files added to the read-only media. One "
"caveat is that the union will use I<DIR> from the image's read-only file "
@@ -284,121 +285,122 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live.persist.5:102
+#: en/live-persistence.conf.5:102
#, no-wrap
msgid "DIRECTORIES"
msgstr ""
#. type: IP
-#: en/live.persist.5:103
+#: en/live-persistence.conf.5:103
#, no-wrap
-msgid "B</live/persistent>"
+msgid "B</live/persistence>"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:109
+#: en/live-persistence.conf.5:109
msgid ""
-"All persistent volumes will be mounted here (in a directory corresponding to "
-"the device name). The B<live.persist> file can easily be edited through this "
-"mount, as well as any source directories (which is especially practical for "
-"custom mounts using the B<linkfiles> option)."
+"All persistence volumes will be mounted here (in a directory corresponding "
+"to the device name). The B<live-persistence.conf> file can easily be edited "
+"through this mount, as well as any source directories (which is especially "
+"practical for custom mounts using the B<link> option)."
msgstr ""
#. type: SH
-#: en/live.persist.5:110
+#: en/live-persistence.conf.5:110
#, no-wrap
msgid "EXAMPLES"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:115
+#: en/live-persistence.conf.5:115
msgid ""
-"Let's say we have a persistent volume I<VOL> with the a B<live.persist> file "
-"containing the following four lines (numbered for ease of reference):"
+"Let's say we have a persistence volume I<VOL> with the a B<live-persistence."
+"conf> file containing the following four lines (numbered for ease of "
+"reference):"
msgstr ""
#. type: TP
-#: en/live.persist.5:115 en/live.persist.5:129
+#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129
#, no-wrap
msgid "1."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:118
-msgid "/home/user1 linkfiles,source=config-files/user1"
+#: en/live-persistence.conf.5:118
+msgid "/home/user1 link,source=config-files/user1"
msgstr ""
#. type: TP
-#: en/live.persist.5:118 en/live.persist.5:133
+#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133
#, no-wrap
msgid "2."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:121
-msgid "/home/user2 linkfiles,source=config-files/user2"
+#: en/live-persistence.conf.5:121
+msgid "/home/user2 link,source=config-files/user2"
msgstr ""
#. type: TP
-#: en/live.persist.5:121 en/live.persist.5:137
+#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137
#, no-wrap
msgid "3."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:124
+#: en/live-persistence.conf.5:124
msgid "/home"
msgstr ""
#. type: TP
-#: en/live.persist.5:124 en/live.persist.5:140
+#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140
#, no-wrap
msgid "4."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:127
+#: en/live-persistence.conf.5:127
msgid "/usr union"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:129
+#: en/live-persistence.conf.5:129
msgid "The corresponding source directories are:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:133
+#: en/live-persistence.conf.5:133
msgid ""
"I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
"B<source> option)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:137
+#: en/live-persistence.conf.5:137
msgid ""
"I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
"B<source> option)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:140
+#: en/live-persistence.conf.5:140
msgid "I<VOL>/home"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:143
+#: en/live-persistence.conf.5:143
msgid "I<VOL>/usr"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:146
+#: en/live-persistence.conf.5:146
msgid ""
"It was necessary to set the B<source> options for 1 and 2, since they "
-"otherwise would become nested with 3's source, which is illegal."
+"otherwise would become nested with 3's source, which is invalid."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:151
+#: en/live-persistence.conf.5:151
msgid ""
"Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
"mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -407,88 +409,89 @@ msgid ""
msgstr ""
#. type: TP
-#: en/live.persist.5:151
+#: en/live-persistence.conf.5:151
#, no-wrap
msgid "a."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:154
+#: en/live-persistence.conf.5:154
msgid "I<VOL>/config-files/user1/.emacs"
msgstr ""
#. type: TP
-#: en/live.persist.5:154
+#: en/live-persistence.conf.5:154
#, no-wrap
msgid "b."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:157
+#: en/live-persistence.conf.5:157
msgid "I<VOL>/config-files/user2/.bashrc"
msgstr ""
#. type: TP
-#: en/live.persist.5:157
+#: en/live-persistence.conf.5:157
#, no-wrap
msgid "c."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:160
+#: en/live-persistence.conf.5:160
msgid "I<VOL>/config-files/user2/.ssh/config"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:162
+#: en/live-persistence.conf.5:162
msgid "Then the following links and directories will be created:"
msgstr ""
#. type: TP
-#: en/live.persist.5:162 en/live.persist.5:165 en/live.persist.5:171
+#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165
+#: en/live-persistence.conf.5:171
#, no-wrap
msgid "Link:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:165
+#: en/live-persistence.conf.5:165
msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:168
+#: en/live-persistence.conf.5:168
msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
msgstr ""
#. type: TP
-#: en/live.persist.5:168
+#: en/live-persistence.conf.5:168
#, no-wrap
msgid "Dir:"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:171
+#: en/live-persistence.conf.5:171
msgid "/homea/user2/.ssh (from c)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:175
+#: en/live-persistence.conf.5:175
msgid ""
"/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:181
+#: en/live-persistence.conf.5:181
msgid ""
-"One could argue, though, that lines 1 and 2 in the example B<live.persist> "
-"file above are unnecessary since line 3 already would make all of /home "
-"persistent. The B<linkfiles> option is intended for situations where you "
-"don't want a complete directory to be persistent, only certain files in it "
-"or its sub-directories."
+"One could argue, though, that lines 1 and 2 in the example B<live-"
+"persistence.conf> file above are unnecessary since line 3 already would make "
+"all of /home persistent. The B<link> option is intended for situations where "
+"you don't want a complete directory to be persistent, only certain files in "
+"it or its sub-directories."
msgstr ""
#. type: Plain text
-#: en/live.persist.5:190
+#: en/live-persistence.conf.5:190
msgid ""
"Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
"completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -500,12 +503,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live.persist.5:193
+#: en/live-persistence.conf.5:193
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live.persist.5:213
+#: en/live-persistence.conf.5:213
msgid ""
"live.persist was written by anonym E<lt>I<anonym at lavabit.com>E<gt> for the "
"Debian project."
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index a20119c..9967cd9 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-05 08:11+0300\n"
+"POT-Creation-Date: 2012-04-09 18:57+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,68 +17,68 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "LIVE-BOOT"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2012-04-05"
+msgid "2012-04-09"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a26-1"
+msgid "3.0~a27-1"
msgstr ""
#. type: TH
-#: en/live-boot.7:1 en/live-snapshot.1:1 en/live.persist.5:1
+#: en/live-boot.7:1 en/live-persistence.conf.5:1 en/live-snapshot.1:1
#, no-wrap
msgid "Debian Live Project"
msgstr ""
#. type: SH
-#: en/live-boot.7:3 en/live-snapshot.1:3 en/live.persist.5:3
+#: en/live-boot.7:3 en/live-persistence.conf.5:3 en/live-snapshot.1:3
#, no-wrap
msgid "NAME"
msgstr ""
#. type: SH
-#: en/live-boot.7:6 en/live-snapshot.1:17 en/live.persist.5:7
+#: en/live-boot.7:6 en/live-persistence.conf.5:7 en/live-snapshot.1:17
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
#. type: SH
-#: en/live-boot.7:28 en/live-snapshot.1:20 en/live.persist.5:57
+#: en/live-boot.7:28 en/live-persistence.conf.5:57 en/live-snapshot.1:20
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: IP
-#: en/live-boot.7:145 en/live-snapshot.1:43
+#: en/live-boot.7:143 en/live-snapshot.1:43
#, no-wrap
msgid "B</etc/live.conf>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 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:147 en/live-snapshot.1:45
+#: en/live-boot.7:145 en/live-snapshot.1:45
#, no-wrap
msgid "B<live/filesystem.module>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 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 \"/"
@@ -86,18 +86,18 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
-#: en/live-boot.7:149 en/live-snapshot.1:47
+#: en/live-boot.7:147 en/live-snapshot.1:47
#, no-wrap
msgid "B</etc/live-persistence.binds>"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:151 en/live-snapshot.1:49
+#: en/live-boot.7:149 en/live-snapshot.1:49
msgid ""
"This optional file (which resides in the rootfs system, not in the live "
"media) is used as a list of directories which not need be persistent: ie. "
@@ -106,7 +106,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-boot.7:154 en/live-snapshot.1:51
+#: en/live-boot.7:152 en/live-snapshot.1:51
msgid ""
"This saves expensive writes and speeds up operations on volatile data such "
"as web caches and temporary files (like e.g. /tmp and .mozilla) which are "
@@ -115,40 +115,40 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:155 en/live-snapshot.1:42
+#: en/live-boot.7:153 en/live-snapshot.1:42
#, no-wrap
msgid "FILES"
msgstr ""
#. type: SH
-#: en/live-boot.7:162 en/live-snapshot.1:54 en/live.persist.5:191
+#: en/live-boot.7:160 en/live-persistence.conf.5:191 en/live-snapshot.1:54
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:168 en/live-snapshot.1:58 en/live.persist.5:195
+#: en/live-boot.7:166 en/live-persistence.conf.5:195 en/live-snapshot.1:58
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:170 en/live-snapshot.1:60 en/live.persist.5:197
+#: en/live-boot.7:168 en/live-persistence.conf.5:197 en/live-snapshot.1:60
msgid "I<live-config>(7)"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:172 en/live-snapshot.1:62 en/live.persist.5:199
+#: en/live-boot.7:170 en/live-persistence.conf.5:199 en/live-snapshot.1:62
msgid "I<live-tools>(7)"
msgstr ""
#. type: SH
-#: en/live-boot.7:173 en/live-snapshot.1:63 en/live.persist.5:200
+#: en/live-boot.7:171 en/live-persistence.conf.5:200 en/live-snapshot.1:63
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:175 en/live-snapshot.1:65 en/live.persist.5:204
+#: en/live-boot.7:173 en/live-persistence.conf.5:204 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 "
@@ -156,13 +156,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:176 en/live-snapshot.1:66 en/live.persist.5:205
+#: en/live-boot.7:174 en/live-persistence.conf.5:205 en/live-snapshot.1:66
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:178 en/live-snapshot.1:68 en/live.persist.5:210
+#: en/live-boot.7:176 en/live-persistence.conf.5:210 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 "
@@ -171,13 +171,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-boot.7:179 en/live-snapshot.1:69 en/live.persist.5:211
+#: en/live-boot.7:177 en/live-persistence.conf.5:211 en/live-snapshot.1:69
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-boot.7:180 en/live-snapshot.1:70
+#: en/live-boot.7:178 en/live-snapshot.1:70
msgid ""
"live-boot was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt> for "
"the Debian project."
@@ -225,8 +225,8 @@ msgstr ""
#: en/live-snapshot.1:19
msgid ""
"live-snapshot is a script which can be used to build the right types of "
-"persistent image files supported by I<live-boot>(7). It is also used on exit "
-"by the live-boot init script to resync the boot-found snapshots devices."
+"persistence image files supported by I<live-boot>(7). It is also used on "
+"exit by the live-boot init script to resync the boot-found snapshots devices."
msgstr ""
#. type: IP
@@ -239,9 +239,9 @@ msgstr ""
#: en/live-snapshot.1:23
msgid ""
"specifies the input directory to be cloned in the image file. Its default "
-"value \"/live/cow\" should be right for most uses. However it could be handy "
-"to specify \"/home\" and type ext2 for the type to prepare an image file "
-"suited to be directly mounted by live-boot as home."
+"value \"/live/overlay\" should be right for most uses. However it could be "
+"handy to specify \"/home\" and type ext4 for the type to prepare an image "
+"file suited to be directly mounted by live-boot as home."
msgstr ""
#. type: IP
@@ -256,7 +256,7 @@ msgid ""
"sets the device where the media which the snapshot/persistence file/"
"partition will be put. If it is not specified, a tmpfs will be used and "
"linked to the user's desktop to move it where it is needed. If the device "
-"has no filesystem, an ext2 fs will be automatically created and labelled "
+"has no filesystem, an ext4 fs will be automatically created and labelled "
"according to the values specified after the \"--output\" value or with a "
"sane default."
msgstr ""
diff --git a/scripts/live b/scripts/live
index e248937..780c5de 100755
--- a/scripts/live
+++ b/scripts/live
@@ -11,8 +11,6 @@ mountpoint="/live/image"
alt_mountpoint="/media"
LIVE_MEDIA_PATH="live"
-USERNAME="user"
-USERFULLNAME="Live user"
HOSTNAME="host"
mkdir -p "${mountpoint}"
@@ -801,7 +799,7 @@ try_snap ()
return 1
fi
- if [ -z ${PERSISTENT_READONLY} ]
+ if [ -z ${PERSISTENCE_READONLY} ]
then
echo "export ${snap_type}SNAP=${snap_relpath}:${snapdev}:${snapfile}" >> snapshot.conf # for resync on reboot/halt
fi
@@ -954,10 +952,14 @@ setup_unionfs ()
log_end_msg
fi
- mkdir -p /cow
+ # tmpfs file systems
+ touch /etc/fstab
+ mkdir -p /live
+ mount -t tmpfs tmpfs /live
+ mkdir -p /live/overlay
- # Looking for persistent devices or files
- if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
+ # Looking for persistence devices or files
+ if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
then
if [ -z "${QUICKUSBMODULES}" ]
@@ -987,7 +989,7 @@ setup_unionfs ()
done
fi
- case "${PERSISTENT_MEDIA}" in
+ case "${PERSISTENCE_MEDIA}" in
removable)
whitelistdev="$(removable_dev)"
;;
@@ -999,21 +1001,20 @@ setup_unionfs ()
;;
esac
- if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
+ if echo ${PERSISTENCE_METHOD} | grep -qe "\<overlay\>"
then
- overlays="${root_overlay_label} ${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
+ overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
fi
- if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
+ if echo ${PERSISTENCE_METHOD} | grep -qe "\<snapshot\>"
then
snapshots="${root_snapshot_label} ${home_snapshot_label}"
fi
local root_snapdata=""
- local home_snapshot_label=""
- local root_overlay_label=""
+ local home_snapdata=""
local overlay_devices=""
- for media in $(find_persistent_media "${overlays}" "${snapshots}" "${whitelistdev}")
+ for media in $(find_persistence_media "${overlays}" "${snapshots}" "${whitelistdev}")
do
media="$(echo ${media} | tr ":" " ")"
case ${media} in
@@ -1032,16 +1033,14 @@ setup_unionfs ()
home_snapdata="${media#*=}"
fi
;;
- ${root_overlay_label}=*|${old_root_overlay_label}=*)
- if [ -z "${root_overlay_device}" ]
- then
- device="${media#*=}"
- root_overlay_device="${device}"
- fi
+ ${old_root_overlay_label}=*)
+ device="${media#*=}"
+ fix_backwards_compatibility ${device} / union
+ overlay_devices="${overlay_devices} ${device}"
;;
${old_home_overlay_label}=*)
device="${media#*=}"
- fix_home_rw_compatibility ${device}
+ fix_backwards_compatibility ${device} /home bind
overlay_devices="${overlay_devices} ${device}"
;;
${custom_overlay_label}=*)
@@ -1050,27 +1049,7 @@ setup_unionfs ()
;;
esac
done
-
- if [ -b "${root_overlay_device}" ]
- then
- PERSISTENCE_IS_ON="1"
- export PERSISTENCE_IS_ON
-
- cowdevice=${root_overlay_device}
- cow_fstype=$(get_fstype "${root_overlay_device}")
- if [ -z "${PERSISTENT_READONLY}" ]
- then
- cow_mountopt="rw,noatime"
- else
- cow_mountopt="ro,noatime"
- fi
-
- if [ "${FORCEPERSISTENTFSCK}" = "Yes" ]
- then
- fsck -y ${cowdevice}
- fi
- fi
- elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
+ elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENCE}" ]
then
# check if there are any nfs options
if echo ${NFS_COW}|grep -q ','
@@ -1082,7 +1061,7 @@ setup_unionfs ()
nfs_cow=${NFS_COW}
fi
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
nfs_cow_opts="${nfs_cow_opts},nocto,ro"
fi
@@ -1106,13 +1085,13 @@ setup_unionfs ()
if [ "${UNIONTYPE}" != "unionmount" ]
then
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
then
- mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/cow"
- root_backing="${rootmnt}/live/persistent/$(basename ${cowdevice})-root"
+ mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay"
+ root_backing="/live/persistence/$(basename ${cowdevice})-root"
mkdir -p ${root_backing}
else
- root_backing="/cow"
+ root_backing="/live/overlay"
fi
if [ "${cow_fstype}" = "nfs" ]
@@ -1162,16 +1141,15 @@ setup_unionfs ()
mkdir -p ${unionmountpoint}
if [ "${UNIONTYPE}" = "unionmount" ]
then
- # FIXME: handle PERSISTENT_READONLY
+ # FIXME: handle PERSISTENCE_READONLY
unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
mount_full $unionmountopts "${unionmountpoint}"
else
- cow_dir="/cow${dir}"
+ cow_dir="/live/overlay${dir}"
rofs_dir="${rofs}${dir}"
mkdir -p ${cow_dir}
- if [ -n "${PERSISTENT_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
+ if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
then
- #mount -t tmpfs -o rw,noatime,mode=755 tmpfs "${cow_dir}"
do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir}
else
do_union ${unionmountpoint} ${cow_dir} ${rofs_dir}
@@ -1182,20 +1160,15 @@ setup_unionfs ()
# Correct the permissions of /:
chmod 0755 "${rootmnt}"
- # tmpfs file systems
- touch /etc/fstab
- mkdir -p "${rootmnt}/live"
- mount -t tmpfs tmpfs ${rootmnt}/live
-
live_rofs_list=""
# SHOWMOUNTS is necessary for custom mounts with the union option
# Since we may want to do custom mounts in user-space it's best to always enable SHOWMOUNTS
- if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ] 1)
+ if true #[ -n "${SHOWMOUNTS}" ] || ( [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] 1)
then
# XXX: is the for loop really necessary? rofslist can only contain one item (see above XXX about EXPOSEDROOT) and this is also assumed elsewhere above (see use of $rofs above).
for d in ${rofslist}
do
- live_rofs="${rootmnt}/live/rofs/${d##*/}"
+ live_rofs="/live/rofs/${d##*/}"
live_rofs_list="${live_rofs_list} ${live_rofs}"
mkdir -p "${live_rofs}"
case d in
@@ -1216,8 +1189,8 @@ setup_unionfs ()
done
fi
- # Adding custom persistent
- if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
+ # Adding custom persistence
+ if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
then
local custom_mounts="/tmp/custom_mounts.list"
rm -rf ${custom_mounts} 2> /dev/null
@@ -1225,7 +1198,7 @@ setup_unionfs ()
# Gather information about custom mounts from devies detected as overlays
get_custom_mounts ${custom_mounts} ${overlay_devices}
- [ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistent"
+ [ -n "${DEBUG}" ] && cp ${custom_mounts} "/live/persistence"
# Now we do the actual mounting (and symlinking)
local used_overlays=""
@@ -1237,19 +1210,23 @@ setup_unionfs ()
do
if echo ${used_overlays} | grep -qve "^\(.* \)\?${device}\( .*\)\?$"
then
- close_persistent_media ${overlay}
+ close_persistence_media ${overlay}
fi
done
# Look for other snapshots to copy in
- try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
+ [ -n "${root_snapdata}" ] && try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
# This second type should be removed when snapshot grow smarter
- try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
+ [ -n "${home_snapdata}" ] && try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
fi
- # shows cow fs on /cow for use by live-snapshot
- mkdir -p "${rootmnt}/live/cow"
- mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
+ mkdir -p "${rootmnt}/live"
+ mount -o move /live "${rootmnt}/live" >/dev/null 2>&1 || mount -o bind /live "${rootmnt}/live" || log_warning_msg "Unable to move or bind /live to ${rootmnt}/live"
+
+ # shows cow fs on /overlay for use by live-snapshot
+ mkdir -p "${rootmnt}/live/overlay"
+ mount -o move /live/overlay "${rootmnt}/live/overlay" >/dev/null 2>&1 || mount -o bind /overlay "${rootmnt}/live/overlay" || log_warning_msg "Unable to move or bind /overlay to ${rootmnt}/live/overlay"
+
}
check_dev ()
@@ -1357,6 +1334,21 @@ check_dev ()
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
[ -n "$devuid" ] && echo "$devuid" >> $tried
+ if [ -n "${FINDISO}" ]
+ then
+ if [ -f ${mountpoint}/${FINDISO} ]
+ then
+ umount ${mountpoint}
+ mkdir -p /live/findiso
+ mount -t ${fstype} -o ro,noatime "${devname}" /live/findiso
+ loopdevname=$(setup_loop "/live/findiso/${FINDISO}" "loop" "/sys/block/loop*" 0 "")
+ devname="${loopdevname}"
+ mount -t iso9660 -o ro,noatime "${devname}" ${mountpoint}
+ else
+ umount ${mountpoint}
+ fi
+ fi
+
if is_live_path ${mountpoint} && \
([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
then
@@ -1643,6 +1635,28 @@ mountroot ()
# when booting FAI, this simple workaround solves it
ls /root/* >/dev/null 2>&1
+ # Move findiso directory to the new root filesystem so that programs there can get at it.
+ if [ -d /live/findiso ] && [ ! -d /root/live/findiso ]
+ then
+ mkdir -p /root/live/findiso
+ mount -n --move /live/findiso /root/live/findiso
+ fi
+
+ # if we do not unmount the ISO we can't run "fsck /dev/ice" later on
+ # because the mountpoint is left behind in /proc/mounts, so let's get
+ # rid of it when running from RAM
+ if [ -n "$FINDISO" ] && [ "${TORAM}" ]
+ then
+ losetup -d /dev/loop0
+
+ if is_mountpoint /live/findiso
+ then
+ umount /root/live/findiso
+ rmdir --ignore-fail-on-non-empty /root/live/findiso \
+ >/dev/null 2>&1 || true
+ fi
+ fi
+
# copy snapshot configuration if exists
if [ -f snapshot.conf ]
then
diff --git a/scripts/live-bottom/08persistence_excludes b/scripts/live-bottom/08persistence_excludes
index 43639f9..633f6ac 100755
--- a/scripts/live-bottom/08persistence_excludes
+++ b/scripts/live-bottom/08persistence_excludes
@@ -26,7 +26,7 @@ esac
# live-boot header
-if [ -z "${PERSISTENT}" ] || [ -n "${NOPERSISTENT}" ] || [ -z "${PERSISTENCE_IS_ON}" ] || [ ! -f /root/etc/live-persistence.binds ]
+if [ -z "${PERSISTENCE}" ] || [ -n "${NOPERSISTENCE}" ] || [ -z "${PERSISTENCE_IS_ON}" ] || [ ! -f /root/etc/live-persistence.binds ]
then
exit 0
fi
diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index ba4a7a3..7f43937 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -32,19 +32,6 @@ log_begin_msg "Configuring fstab"
# live-boot script
-# Create a fake fstab only if it doesn't exist or if its the debootstrap template
-if [ ! -f "${FSTAB}" ] || grep -qs 'UNCONFIGURED FSTAB FOR BASE SYSTEM' "${FSTAB}"
-then
-
-cat > ${FSTAB} << EOF
-# /etc/fstab: static file system information.
-#
-# <file system> <mount point> <type> <options> <dump> <pass>
-
-EOF
-
-fi
-
if ! grep -qs "^${UNIONTYPE}" "${FSTAB}"
then
echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${FSTAB}"
diff --git a/scripts/live-bottom/24preseed b/scripts/live-bottom/24preseed
deleted file mode 100755
index 85c6494..0000000
--- a/scripts/live-bottom/24preseed
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-boot header
-
-if [ -n "${NOPRESEED}" ]
-then
- exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Loading preseed file"
-
-# live-boot script
-
-if [ -e /preseed.cfg ]
-then
- chroot /root debconf-set-selections < /preseed.cfg
-fi
-
-if [ -n "${LOCATIONS}" ]
-then
- for item in ${LOCATIONS}
- do
- chroot /root debconf-set-selections < "/root${item}"
- done
-fi
-
-if [ -n "${PRESEEDS}" ]
-then
- for preseed in ${PRESEEDS}
- do
- question="${preseed%%=*}"
- value="${preseed#*=}"
-
- live-preseed /root "${question}" "${value}"
- done
-fi
-
-reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive live-boot)"
-
-if [ "${reply#0 }" != "${reply}" ]
-then
- reply="${reply#0 }"
- sh -c "${reply}"
-fi
-
-# Clear out debconf database backup files to save memory.
-rm -f /root/var/cache/debconf/*.dat-old
-
-log_end_msg
-
-exit 0
diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility
deleted file mode 100755
index 4ed1c6d..0000000
--- a/scripts/live-bottom/30accessibility
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
- echo "${PREREQ}"
-}
-
-case "${1}" in
- prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-# live-boot header
-
-if [ -n "${NOACCESSIBILITY}" ]
-then
- exit 0
-fi
-
-. /scripts/live-functions
-
-if [ -z "${USERNAME}" ]
-then
- echo "No default user for accessibility options."
- exit 0
-fi
-
-log_begin_msg "Configuring accessibility options"
-
-# live-boot script
-
-gconf_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gconf2 2>/dev/null) || gconf_version=""
-
-gct ()
-{
- if [ "${gconf_version}" ]
- then
- chroot /root sudo -u "${USERNAME}" gconftool-2 "${@}"
- fi
-}
-
-remove_applet ()
-{
- # Code to remove an applet from the default panel setup
- # This is rather hacky, but I can't think of a one or two line regular
- # expression to do this any more efficiently. Patches welcome. In
- # addition, setting these via gconf also doesn't work for some reason.
-
- local line_no prior_line next_line
-
- line_no="$(grep -n "<string>$1</string>" /root/usr/share/gconf/defaults/05_panel-default-setup.entries | cut -f 1 -d :)"
- [ "$line_no" ] || return
- prior_line="$((line_no-1))"
- next_line="$((line_no+1))"
-
- sed -i -n "${prior_line},${next_line}!p" /root/usr/share/gconf/defaults/05_panel-default-setup.entries
-
- 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/interface/gtk_theme HighContrastLargePrint
- gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
- gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
- gct -s -t string /desktop/gnome/interface/font_name "sans 18"
- gct -s -t string /apps/metacity/general/theme Atlanta
- gct -s -t string /desktop/gnome/background/picture_filename ""
- gct -s -t string /desktop/gnome/background/picture_options none
- gct -s -t string /desktop/gnome/background/primary_color \#666666
- gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
- gct -s -t string /desktop/gnome/background/color_shading_type solid
- gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
- gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
- ;;
-
- access=v2)
- # Moderate Visual Impairment
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t bool /desktop/gnome/applications/at/visual/startup true
- 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
-
- if [ -x /root/usr/bin/orca ]
- then
- mkdir -p /root/home/${USERNAME}/.orca
- echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
- echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
- echo "orca.settings.enableMagnifier = True" >> /root/home/${USERNAME}/.orca/user-settings.py
- chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
- fi
- ;;
-
- access=v3)
- # Blindness
- # Disabled for now, until we know eSpeak works.
- #gct -s -t bool /desktop/gnome/sound/enable_esd false
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t bool /desktop/gnome/applications/at/visual/startup true
- gct -s -t string /desktop/gnome/applications/at/visual/exec orca
- 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
-
- remove_applet fast_user_switch
- if [ -x /root/usr/bin/orca ]
- then
- mkdir -p /root/home/$USERNAME/.orca
- chroot /root chown -R $USERNAME.$USERNAME /home/$USERNAME/.orca
- fi
- ;;
-
- braille=ask)
- # Braille
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t bool /desktop/gnome/applications/at/visual/startup true
- 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
- gct -s -t string /apps/empathy/conversation/theme classic
- add_sudoers_file
-
- if [ -x /root/usr/bin/orca ]
- then
- mkdir -p /root/home/${USERNAME}/.orca
- echo "import orca.settings" >> /root/home/${USERNAME}/.orca/user-settings.py
- echo "orca.settings.enableSpeech = False" >> /root/home/${USERNAME}/.orca/user-settings.py
- echo "orca.settings.enableBraille = True" >> /root/home/${USERNAME}/.orca/user-settings.py
- laptop_detect
- chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.orca
- fi
-
- remove_applet fast_user_switch
- ;;
-
- access=m1)
- # Minor Motor Difficulties
- gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
- gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
- gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
- gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
- gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
- gct -s -t bool /apps/gksu/disable-grab true
-
- if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]
- then
- sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
- fi
- ;;
-
- access=m2)
- # Motor Difficulties - pointing devices
- gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
- gct -s -t bool /desktop/gnome/interface/accessibility true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
- gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
- gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
- gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
-
- if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]
- then
- sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
- fi
- ;;
-esac
-
-log_end_msg
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 889d157..b90637a 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -15,14 +15,13 @@ else
udevinfo='udevinfo'
fi
-root_overlay_label="full-ov"
old_root_overlay_label="live-rw"
old_home_overlay_label="home-rw"
custom_overlay_label="custom-ov"
root_snapshot_label="live-sn"
old_root_snapshot_label="live-sn"
home_snapshot_label="home-sn"
-persistence_list="live.persist"
+persistence_list="live-persistence.conf"
Arguments ()
{
@@ -89,9 +88,14 @@ Arguments ()
export FETCH
;;
- forcepersistentfsck)
- FORCEPERSISTENTFSCK="Yes"
- export FORCEPERSISTENTFSCK
+ findiso=*)
+ FINDISO="${ARGUMENT#findiso=}"
+ export FINDISO
+ ;;
+
+ forcepersistencefsck)
+ FORCEPERSISTENCEFSCK="Yes"
+ export FORCEPERSISTENCEFSCK
;;
ftpfs=*)
@@ -188,8 +192,8 @@ Arguments ()
export NFSOPTS
;;
- nfscow=*)
- NFS_COW="${ARGUMENT#nfscow=}"
+ nfsoverlay=*)
+ NFS_COW="${ARGUMENT#nfsoverlay=}"
export NFS_COW
;;
@@ -222,52 +226,51 @@ Arguments ()
export SWAPON
;;
- persistent)
- PERSISTENT="Yes"
- export PERSISTENT
+ persistence)
+ PERSISTENCE="Yes"
+ export PERSISTENCE
;;
- persistent-encryption=*)
- PERSISTENT_ENCRYPTION="${ARGUMENT#*=}"
- export PERSISTENT_ENCRYPTION
+ persistence-encryption=*)
+ PERSISTENCE_ENCRYPTION="${ARGUMENT#*=}"
+ export PERSISTENCE_ENCRYPTION
;;
- persistent-media=*)
- PERSISTENT_MEDIA="${ARGUMENT#*=}"
- export PERSISTENT_MEDIA
+ persistence-media=*)
+ PERSISTENCE_MEDIA="${ARGUMENT#*=}"
+ export PERSISTENCE_MEDIA
;;
- persistent-method=*)
- PERSISTENT_METHOD="${ARGUMENT#*=}"
- export PERSISTENT_METHOD
+ persistence-method=*)
+ PERSISTENCE_METHOD="${ARGUMENT#*=}"
+ export PERSISTENCE_METHOD
;;
- persistent-path=*)
- PERSISTENT_PATH="${ARGUMENT#persistent-path=}"
- export PERSISTENT_PATH
+ persistence-path=*)
+ PERSISTENCE_PATH="${ARGUMENT#persistence-path=}"
+ export PERSISTENCE_PATH
;;
- persistent-read-only)
- PERSISTENT_READONLY="Yes"
- export PERSISTENT_READONLY
+ persistence-read-only)
+ PERSISTENCE_READONLY="Yes"
+ export PERSISTENCE_READONLY
;;
- persistent-storage=*)
- PERSISTENT_STORAGE="${ARGUMENT#persistent-storage=}"
- export PERSISTENT_STORAGE
+ persistence-storage=*)
+ PERSISTENCE_STORAGE="${ARGUMENT#persistence-storage=}"
+ export PERSISTENCE_STORAGE
;;
- persistent-subtext=*)
- root_overlay_label="${root_overlay_label}-${ARGUMENT#persistent-subtext=}"
- old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistent-subtext=}"
- old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistent-subtext=}"
- custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistent-subtext=}"
- root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}"
- old_root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistent-subtext=}"
- home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistent-subtext=}"
+ persistence-subtext=*)
+ old_root_overlay_label="${old_root_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ old_home_overlay_label="${old_home_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ custom_overlay_label="${custom_overlay_label}-${ARGUMENT#persistence-subtext=}"
+ root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistence-subtext=}"
+ old_root_snapshot_label="${root_snapshot_label}-${ARGUMENT#persistence-subtext=}"
+ home_snapshot_label="${home_snapshot_label}-${ARGUMENT#persistence-subtext=}"
;;
- nopersistent)
- NOPERSISTENT="Yes"
- export NOPERSISTENT
+ nopersistence)
+ NOPERSISTENCE="Yes"
+ export NOPERSISTENCE
;;
noprompt)
@@ -381,37 +384,37 @@ Arguments ()
export UNIONTYPE
fi
- if [ -z "${PERSISTENT_ENCRYPTION}" ]
+ if [ -z "${PERSISTENCE_ENCRYPTION}" ]
then
- PERSISTENT_ENCRYPTION="none"
- export PERSISTENT_ENCRYPTION
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>"
+ PERSISTENCE_ENCRYPTION="none"
+ export PERSISTENCE_ENCRYPTION
+ elif echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>"
then
if ! modprobe dm-crypt
then
log_warning_msg "Unable to load module dm-crypt"
- PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
- export PERSISTENT_ENCRYPTION
+ PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+ export PERSISTENCE_ENCRYPTION
fi
if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
then
log_warning_msg "cryptsetup in unavailable"
- PERSISTENT_ENCRYPTION=$(echo ${PERSISTENT_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
- export PERSISTENT_ENCRYPTION
+ PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
+ export PERSISTENCE_ENCRYPTION
fi
fi
- if [ -z "${PERSISTENT_METHOD}" ]
+ if [ -z "${PERSISTENCE_METHOD}" ]
then
- PERSISTENT_METHOD="snapshot,overlay"
- export PERSISTENT_METHOD
+ PERSISTENCE_METHOD="snapshot,overlay"
+ export PERSISTENCE_METHOD
fi
- if [ -z "${PERSISTENT_STORAGE}" ]
+ if [ -z "${PERSISTENCE_STORAGE}" ]
then
- PERSISTENT_STORAGE="filesystem,file"
- export PERSISTENT_STORAGE
+ PERSISTENCE_STORAGE="filesystem,file"
+ export PERSISTENCE_STORAGE
fi
}
@@ -737,19 +740,12 @@ try_mount ()
fi
}
-mount_persistent_media ()
+mount_persistence_media ()
{
local device=${1}
- local backing=""
+ local probe=${2}
- # We can't mount into ${rootmnt}/live before ${rootmnt} has been
- # mounted since that would cover our mountpoint.
- if [ -n "${rootmnt}" ] && [ -z "$(what_is_mounted_on ${rootmnt})" ]
- then
- backing="/$(basename ${device})-backing"
- else
- backing="${rootmnt}/live/persistent/$(basename ${device})"
- fi
+ local backing="/live/persistence/$(basename ${device})"
mkdir -p "${backing}"
local old_backing="$(where_is_mounted ${device})"
@@ -757,7 +753,7 @@ mount_persistent_media ()
then
local fstype="$(get_fstype ${device})"
local mount_opts="rw,noatime"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
mount_opts="ro,noatime"
fi
@@ -766,7 +762,8 @@ mount_persistent_media ()
echo ${backing}
return 0
else
- log_warning_msg "Failed to mount persistent media ${device}"
+ [ -z "${probe}" ] && log_warning_msg "Failed to mount persistence media ${device}"
+ rmdir "${backing}"
return 1
fi
elif [ "${backing}" != "${old_backing}" ]
@@ -776,14 +773,15 @@ mount_persistent_media ()
echo ${backing}
return 0
else
- log_warning_msg "Failed to move persistent media ${device}"
+ [ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
+ rmdir "${backing}"
return 1
fi
fi
return 0
}
-close_persistent_media () {
+close_persistence_media () {
local device=${1}
local backing="$(where_is_mounted ${device})"
@@ -804,7 +802,7 @@ open_luks_device ()
dev="${1}"
name="$(basename ${dev})"
opts="--key-file=-"
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
opts="${opts} --readonly"
fi
@@ -912,7 +910,7 @@ probe_for_file_name ()
local dev="${3}"
local ret=""
- local backing="$(mount_persistent_media ${dev})"
+ local backing="$(mount_persistence_media ${dev} probe)"
if [ -z "${backing}" ]
then
return
@@ -920,7 +918,7 @@ probe_for_file_name ()
for label in ${overlays}
do
- path=${backing}/${PERSISTENT_PATH}${label}
+ path=${backing}/${PERSISTENCE_PATH}${label}
if [ -f "${path}" ]
then
local loopdev=$(setup_loop "${path}" "loop" "/sys/block/loop*")
@@ -931,7 +929,7 @@ probe_for_file_name ()
do
for ext in squashfs cpio.gz ext2 ext3 ext4 jffs2
do
- path="${PERSISTENT_PATH}${label}.${ext}"
+ path="${PERSISTENCE_PATH}${label}.${ext}"
if [ -f "${backing}/${path}" ]
then
ret="${ret} ${label}=${dev}:${backing}:${path}"
@@ -947,7 +945,7 @@ probe_for_file_name ()
fi
}
-find_persistent_media ()
+find_persistence_media ()
{
# Scans devices for overlays and snapshots, and returns a whitespace
# separated list of how to use them. Only overlays with a partition
@@ -955,7 +953,7 @@ find_persistent_media ()
# snapshots with labels in ${snapshots}.
#
# When scanning a LUKS device, the user will be asked to enter the
- # passphrase; on failure to enter it, or if no persistent partitions
+ # passphrase; on failure to enter it, or if no persistence partitions
# or files were found, the LUKS device is closed.
#
# For a snapshot file the return value is ${label}=${snapdata}", where
@@ -975,7 +973,9 @@ find_persistent_media ()
local white_listed_devices="${3}"
local ret=""
- for dev in $(storage_devices "" "${white_listed_devices}")
+ local black_listed_devices="$(what_is_mounted_on /live/image)"
+
+ for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
local result=""
@@ -984,7 +984,7 @@ find_persistent_media ()
# in order to probe any filesystem it contains, like we do
# below. activate_custom_mounts() also depends on that any luks
# device already has been opened.
- if echo ${PERSISTENT_ENCRYPTION} | grep -qe "\<luks\>" && \
+ if echo ${PERSISTENCE_ENCRYPTION} | grep -qe "\<luks\>" && \
is_luks_partition ${dev}
then
if luks_device=$(open_luks_device "${dev}")
@@ -994,14 +994,14 @@ find_persistent_media ()
# skip $dev since we failed/chose not to open it
continue
fi
- elif echo ${PERSISTENT_ENCRYPTION} | grep -qve "\<none\>"
+ elif echo ${PERSISTENCE_ENCRYPTION} | grep -qve "\<none\>"
then
# skip $dev since we don't allow unencrypted storage
continue
fi
# Probe for matching GPT partition names or filesystem labels
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<filesystem\>"
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<filesystem\>"
then
result=$(probe_for_gpt_name "${overlays}" "${snapshots}" ${dev})
if [ -n "${result}" ]
@@ -1019,7 +1019,7 @@ find_persistent_media ()
fi
# Probe for files with matching name on mounted partition
- if echo ${PERSISTENT_STORAGE} | grep -qe "\<file\>"
+ if echo ${PERSISTENCE_STORAGE} | grep -qe "\<file\>"
then
result=$(probe_for_file_name "${overlays}" "${snapshots}" ${dev})
if [ -n "${result}" ]
@@ -1261,7 +1261,7 @@ do_union ()
get_custom_mounts ()
{
- # Side-effect: leaves $devices with live.persist mounted in ${rootmnt}/live/persistent
+ # Side-effect: leaves $devices with live-persistence.conf mounted in /live/persistence
# Side-effect: prints info to file $custom_mounts
local custom_mounts=${1}
@@ -1280,7 +1280,7 @@ get_custom_mounts ()
fi
local device_name="$(basename ${device})"
- local backing=$(mount_persistent_media ${device})
+ local backing=$(mount_persistence_media ${device})
if [ -z "${backing}" ]
then
continue
@@ -1294,7 +1294,7 @@ get_custom_mounts ()
if [ -n "${DEBUG}" ] && [ -e "${include_list}" ]
then
- cp ${include_list} ${rootmnt}/live/persistent/${persistence_list}.${device_name}
+ cp ${include_list} /live/persistence/${persistence_list}.${device_name}
fi
while read dir options # < ${include_list}
@@ -1305,22 +1305,22 @@ get_custom_mounts ()
continue
fi
- if trim_path ${dir} | grep -q -e "^[^/]" -e "^/$" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
+ if trim_path ${dir} | grep -q -e "^[^/]" -e "^/live\(/.*\)\?$" -e "^/\(.*/\)\?\.\.\?\(/.*\)\?$"
then
- log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/live\" (or any sub-directory therein) or \"/\" (for the latter, use ${root_overlay_label}-type persistence)"
+ log_warning_msg "Skipping unsafe custom mount ${dir}: must be an absolute path containing neither the \".\" nor \"..\" special dirs, and cannot be \"/live\" or any sub-directory therein."
continue
fi
local opt_source=""
- local opt_linkfiles=""
+ local opt_link=""
for opt in $(echo ${options} | tr ',' ' ');
do
case "${opt}" in
source=*)
opt_source=${opt#source=}
;;
- linkfiles)
- opt_linkfiles="yes"
+ link)
+ opt_link="yes"
;;
union|bind)
;;
@@ -1345,7 +1345,7 @@ get_custom_mounts ()
local full_source="$(trim_path ${backing}/${source})"
local full_dest="$(trim_path ${rootmnt}/${dir})"
- if [ -n "${opt_linkfiles}" ]
+ if [ -n "${opt_link}" ]
then
echo "${device} ${full_source} ${full_dest} ${options}" >> ${links}
else
@@ -1374,7 +1374,7 @@ get_custom_mounts ()
do
if echo ${source} | grep -qe "^${prev_source}\(/.*\)\?$"
then
- panic "Two persistent mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
+ panic "Two persistence mounts have the same or nested sources: ${source} on ${dest}, and ${prev_source} on ${prev_dest}"
fi
prev_source=${source}
prev_dest=${dest}
@@ -1389,30 +1389,35 @@ activate_custom_mounts ()
while read device source dest options # < ${custom_mounts}
do
local opt_bind="yes"
- local opt_linkfiles=""
+ local opt_link=""
local opt_union=""
for opt in $(echo ${options} | tr ',' ' ');
do
case "${opt}" in
bind)
opt_bind="yes"
- unset opt_linkfiles opt_union
+ unset opt_link opt_union
;;
- linkfiles)
- opt_linkfiles="yes"
+ link)
+ opt_link="yes"
unset opt_bind opt_union
;;
union)
opt_union="yes"
- unset opt_bind opt_linkfiles
+ unset opt_bind opt_link
;;
esac
done
if [ -n "$(what_is_mounted_on "${dest}")" ]
then
- log_warning_msg "Skipping custom mount ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
- continue
+ if [ "${dest}" = "${rootmnt}" ]
+ then
+ umount "${dest}"
+ else
+ log_warning_msg "Skipping custom mount ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"
+ continue
+ fi
fi
if [ ! -d "${dest}" ]
@@ -1440,19 +1445,19 @@ activate_custom_mounts ()
done
fi
- # if ${source} doesn't exist on our persistent media
+ # if ${source} doesn't exist on our persistence media
# we bootstrap it with $dest from the live filesystem.
# this both makes sense and is critical if we're
# dealing with /etc or other system dir.
if [ ! -d "${source}" ]
then
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
continue
- elif [ -n "${opt_union}" ] || [ -n "${opt_linkfiles}" ]
+ elif [ -n "${opt_union}" ] || [ -n "${opt_link}" ]
then
# unions and don't need to be bootstrapped
- # linkfiles dirs can't be bootstrapped in a sensible way
+ # link dirs can't be bootstrapped in a sensible way
mkdir -p "${source}"
chown_ref "${dest}" "${source}"
chmod_ref "${dest}" "${source}"
@@ -1467,9 +1472,9 @@ activate_custom_mounts ()
# XXX: If CONFIG_AUFS_ROBR is added to the Debian kernel we can
# ignore the loop below and set rofs_dest_backing=$dest
local rofs_dest_backing=""
- if [ -n "${opt_linkfiles}"]
+ if [ -n "${opt_link}"]
then
- for d in ${rootmnt}/live/rofs/*
+ for d in /live/rofs/*
do
if [ -n "${rootmnt}" ]
then
@@ -1486,13 +1491,13 @@ activate_custom_mounts ()
done
fi
- if [ -n "${opt_linkfiles}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
link_files ${source} ${dest} ${rootmnt}
- elif [ -n "${opt_linkfiles}" ] && [ -n "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
- mkdir -p ${rootmnt}/live/persistent
- local links_source=$(mktemp -d ${rootmnt}/live/persistent/links-source-XXXXXX)
+ mkdir -p /live/persistence
+ local links_source=$(mktemp -d /live/persistence/links-source-XXXXXX)
chown_ref ${source} ${links_source}
chmod_ref ${source} ${links_source}
# We put the cow dir in the below strange place to
@@ -1500,39 +1505,32 @@ activate_custom_mounts ()
# has its own directory and isn't nested with some
# other custom mount (if so that mount's files would
# be linked, causing breakage.
- if [ -n "${rootmnt}" ]
- then
- local cow_dir="/cow/live/persistent/$(basename ${links_source})"
- else
- # This is happens if persistence is activated
- # post boot
- local cow_dir="/live/cow/live/persistent/$(basename ${links_source})"
- fi
+ local cow_dir="/live/overlay/live/persistence/$(basename ${links_source})"
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
do_union ${links_source} ${cow_dir} ${source} ${rofs_dest_backing}
link_files ${links_source} ${dest} ${rootmnt}
- elif [ -n "${opt_union}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
do_union ${dest} ${source} ${rofs_dest_backing}
- elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
mount --bind "${source}" "${dest}"
- elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENT_READONLY}" ]
+ elif [ -n "${opt_bind}" -o -n "${opt_union}" ] && [ -n "${PERSISTENCE_READONLY}" ]
then
# bind-mount and union mount are handled the same
# in read-only mode, but note that rofs_dest_backing
# is non-empty (and necessary) only for unions
if [ -n "${rootmnt}" ]
then
- local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/cow/|")"
+ local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/live/overlay/|")"
else
# This is happens if persistence is activated
# post boot
- local cow_dir="/live/cow/${dest}"
+ local cow_dir="/live/overlay/${dest}"
fi
- if [ -e "${cow_dir}" ] && [ -z "${opt_linkfiles}" ]
+ if [ -e "${cow_dir}" ] && [ -z "${opt_link}" ]
then
# If an earlier custom mount has files here
# it will "block" the current mount's files
@@ -1557,16 +1555,18 @@ activate_custom_mounts ()
echo ${used_devices}
}
-fix_home_rw_compatibility ()
+fix_backwards_compatibility ()
{
local device=${1}
+ local dir=${2}
+ local opt=${3}
- if [ -n "${PERSISTENT_READONLY}" ]
+ if [ -n "${PERSISTENCE_READONLY}" ]
then
return
fi
- local backing="$(mount_persistent_media ${device})"
+ local backing="$(mount_persistence_media ${device})"
if [ -z "${backing}" ]
then
return
@@ -1575,7 +1575,14 @@ fix_home_rw_compatibility ()
local include_list="${backing}/${persistence_list}"
if [ ! -r "${include_list}" ]
then
- echo "# home-rw backwards compatibility:
-/home source=." > "${include_list}"
+ echo "# persistence backwards compatibility:
+${dir} ${opt},source=." > "${include_list}"
fi
}
+
+is_mountpoint ()
+{
+ directory="$1"
+
+ [ $(stat -fc%d:%D "${directory}") != $(stat -fc%d:%D "${directory}/..") ]
+}
--
live-boot
More information about the debian-live-changes
mailing list