Merge remote-tracking branch 'deb/debian' into debian

VERSION

@@ -1 +1 @@
-3.0~b9-1
+3.0~b10-1

backends/initramfs-tools/live.hook

@@ -143,6 +143,10 @@ then
 	copy_exec /usr/bin/eject /bin
 fi
 
+# Program: mount
+# fuse does not work with klibc mount
+copy_exec /bin/mount /bin/mount.util-linux
+
 [ "${QUIET}" ] || echo -n " utils"
 
 # Feature: Verify Checksums
@@ -236,14 +240,4 @@ case "${LIVE_DNS}" in
 		;;
 esac
 
-case "${LIVE_UNIONMOUNT}" in
-	true)
-		[ "${QUIET}" ] || echo -n " unionmount"
-
-		# UnionMount
-		# only mount from patched util-linux can do this currently
-		copy_exec /bin/mount /bin/mount_full
-		;;
-esac
-
 [ "${QUIET}" ] || echo .

debian/changelog

@@ -1,3 +1,28 @@
+live-boot (3.0~b10-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Adding live-tools to recommends.
+
+  [ Michal Suchanek ]
+  * Including util-linux mount in initramfs.
+
+  [ Daniel Baumann ]
+  * Making overwriting of /bin/mount within initramfs with mount.util-
+    linux dependent on fuse usage, not on some additional boot parameter.
+  * Correcting spelling typo in bug script.
+
+  [ Richard Nelson ]
+  * Update manpage information of ip= param to correctly reflect what
+    9990-netbase.sh expects.
+
+  [ Daniel Baumann ]
+  * Cleaning up manpage po files.
+
+  [ Evgeni Golov ]
+  * Do not fix mountpoints with live-persistence.conf as home-rw/live-rw.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:22:50 +0100
+
 live-boot (3.0~b9-1) unstable; urgency=low
 
   [ Tails developers ]

debian/control

@@ -12,7 +12,7 @@ Vcs-Git: git://live.debian.net/git/live-boot.git
 Package: live-boot
 Architecture: all
 Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend
-Recommends: live-boot-doc, rsync, uuid-runtime
+Recommends: live-boot-doc, live-tools, rsync, uuid-runtime
 Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
 Description: Live System Boot Scripts
  live-boot contains the scripts that configure a live system during the boot

debian/live-boot.bug-presubj

@@ -1,9 +1,9 @@
 Before submitting a bug report against live-boot, please make sure
-that you have read our guidlines for Debian Live bug reports:
+that you have read our guidelines for Debian Live bug reports:
 
   http://live.debian.net/manual/
 
-By providing the required information as outlined in the guidlines makes
+By providing the required information as outlined in the guidelines makes
 sure that we can optimally reproduce and fix bugs, not doing so wastes a
 lot of time for both the maintainers and the submitters.
 

manpages/de/live-boot.de.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 10.12.2012 3.0~b9\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 17.12.2012 3.0~b10\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
@@ -110,7 +110,7 @@ LIVE_GENERATE_UUID=1 when building the initramfs.
 If specified, an MD5 sum is calculated on the live media during boot and
 compared to the value found in md5sum.txt found in the root directory of the
 live media.
-.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4
+.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP]]" 4
 Let you specify the name(s) and the options of the interface(s) that should
 be configured at boot time. Do not specify this if you want to use dhcp
 (default). It will be changed in a future release to mimick official kernel

manpages/de/persistence.conf.de.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 10.12.2012 3.0~b9\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 17.12.2012 3.0~b10\-1 "Debian Live Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot

manpages/en/live-boot.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-12\-10 3.0~b9-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-12\-17 3.0~b10-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -74,7 +74,7 @@ Allows to use a filesystem from within an iso image that's available on live-med
 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs.
 .IP "\fBverify\-checksums\fR" 4
 If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of the live media.
-.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR]]" 4
+.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fINETMASK\fR]:[\fIGATEWAY_IP\fR]:[\fINAMESERVER\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fINETMASK\fR]:[\fIGATEWAY_IP\fR]:[\fINAMESERVER\fR]]" 4
 Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp).
 .IP "\fBip\fR=[\fIfrommedia\fR]" 4
 If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead.

manpages/en/persistence.conf.5

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-12\-10 3.0~b9-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-12\-17 3.0~b10-1 "Debian Live Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in

manpages/es/live-boot.es.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 10.12.2012 3.0~b9\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 17.12.2012 3.0~b10\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
@@ -116,7 +116,7 @@ configurando LIVE_GENERATE_UUID=1 en el momento de crear el initramfs.
 Si se especifica, se calcula una suma MD5 sobre los medios en vivo durante
 el arranque y se compara con el valor md5sum.txt que se encuentra en el
 directorio raíz de los medios en vivo.
-.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4
+.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fINETMASK\fP]:[\fIGATEWAY_IP\fP]:[\fINAMESERVER\fP]]" 4
 Permite especificar el nombre(s) y las opciones de la interfaz(ces) que se
 debe configurar en el arranque. No especificar esta opción si se desea
 utilizar DHCP (opción por defecto). Esto cambiará en una futura versión para

manpages/es/persistence.conf.es.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 10.12.2012 3.0~b9\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 17.12.2012 3.0~b10\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con

manpages/po/de/live-boot.7.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b9-1\n"
-"POT-Creation-Date: 2012-12-10 20:00+0100\n"
+"Project-Id-Version: live-boot 3.0~b10-1\n"
+"POT-Creation-Date: 2012-12-17 20:23+0100\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+msgid "2012-12-17"
+msgstr "17.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b9-1"
-msgstr "3.0~b9-1"
+msgid "3.0~b10-1"
+msgstr "3.0~b10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -338,7 +338,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:77
 #, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 msgstr ""
 
 #. type: Plain text

manpages/po/de/persistence.conf.5.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b9-1\n"
-"POT-Creation-Date: 2012-12-10 20:00+0100\n"
+"Project-Id-Version: live-boot 3.0~b10-1\n"
+"POT-Creation-Date: 2012-12-17 20:23+0100\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+msgid "2012-12-17"
+msgstr "17.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b9-1"
-msgstr "3.0~b9-1"
+msgid "3.0~b10-1"
+msgstr "3.0~b10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/po/es/live-boot.7.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b9-1\n"
-"POT-Creation-Date: 2012-12-10 20:00+0100\n"
+"Project-Id-Version: live-boot 3.0~b10-1\n"
+"POT-Creation-Date: 2012-12-17 20:23+0100\n"
 "PO-Revision-Date: 2012-06-07 20:29+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+msgid "2012-12-17"
+msgstr "17.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b9-1"
-msgstr "3.0~b9-1"
+msgid "3.0~b10-1"
+msgstr "3.0~b10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -406,8 +406,8 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:77
 #, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
-msgstr "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
+msgstr "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 
 #. type: Plain text
 #: en/live-boot.7:79

manpages/po/es/persistence.conf.5.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b9-1\n"
-"POT-Creation-Date: 2012-12-10 20:00+0100\n"
+"Project-Id-Version: live-boot 3.0~b10-1\n"
+"POT-Creation-Date: 2012-12-17 20:23+0100\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
-msgstr "10.12.2012"
+msgid "2012-12-17"
+msgstr "17.12.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b9-1"
-msgstr "3.0~b9-1"
+msgid "3.0~b10-1"
+msgstr "3.0~b10-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/pot/live-boot.7.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:00+0100\n"
+"POT-Creation-Date: 2012-12-17 20:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-17"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b9-1"
+msgid "3.0~b10-1"
 msgstr ""
 
 #. type: TH
@@ -339,7 +339,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:77
 #, no-wrap
-msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<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>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<NETMASK>]:[I<GATEWAY_IP>]:[I<NAMESERVER>]]"
 msgstr ""
 
 #. type: Plain text

manpages/pot/persistence.conf.5.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-12-10 20:00+0100\n"
+"POT-Creation-Date: 2012-12-17 20:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-12-10"
+msgid "2012-12-17"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b9-1"
+msgid "3.0~b10-1"
 msgstr ""
 
 #. type: TH

scripts/boot/9990-main.sh

@@ -32,6 +32,12 @@ Main ()
 		. /conf/param.conf
 	fi
 
+	if [ -n "${FUSE_MOUNT}" ]
+	then
+		# fuse does not work with klibc mount
+		ln -f /bin/mount.util-linux /bin/mount
+	fi
+
 	# Needed here too because some things (*cough* udev *cough*)
 	# changes the timeout
 

scripts/boot/9990-misc-helpers.sh

@@ -1581,7 +1581,7 @@ fix_backwards_compatibility ()
 	fi
 
 	include_list="${backing}/${persistence_list}"
-	if [ ! -r "${include_list}" ]
+	if [ ! -r "${include_list}" ] && [ ! -r "${backing}/${old_persistence_list}" ]
 	then
 		echo "# persistence backwards compatibility:
 ${dir} ${opt},source=." > "${include_list}"

scripts/boot/9990-overlay.sh

@@ -335,7 +335,8 @@ setup_unionfs ()
 		then
 			# FIXME: handle PERSISTENCE_READONLY
 			unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
-			mount_full $unionmountopts "${unionmountpoint}"
+			# unionmount only works with util-linux mount
+			mount.util-linux $unionmountopts "${unionmountpoint}"
 		else
 			cow_dir="/live/overlay${dir}"
 			rootfs_dir="${rootfs}${dir}"