From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Wed, 8 May 2013 06:45:55 +0000 (+0200)
Subject: Adding upstream version 4.0~a12.
X-Git-Tag: upstream/4.0_a12^0
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=fdb0d221a20e64fd5a80c4de62f28b74a1b90f12;hp=e3b11d9a5aa8df89c435118c12d92f9c4201ad85;p=live-boot-grml.git

Adding upstream version 4.0~a12.
---

diff --git a/VERSION b/VERSION
index f7d9b10..a391e7d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a11-1
+4.0~a12-1
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 9508d9b..1274e83 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 06.05.2013 4.0~a11\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 08.05.2013 4.0~a12\-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
@@ -211,7 +211,7 @@ default is "file,filesystem".
 live\-boot will use the name "LABEL" instead of "persistence" when searching
 for persistent storage. LABEL can be any valid filename, partition label, or
 GPT name.
-.IP \fBquickreboot\fP 4
+.IP \fBnoeject\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.
 .IP \fBshowmounts\fP 4
diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index c134248..b3b622a 100644
--- a/manpages/de/persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 08.05.2013 4.0~a12\-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index c323cf4..a5fa565 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2013\-05\-06 4.0~a11-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2013\-05\-08 4.0~a12-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -122,7 +122,7 @@ Filesystem changes are not saved back to persistence media. In particular, overl
 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\-label\fR=\fILABEL\fR" 4
 live-boot will use the name "LABEL" instead of "persistence" when searching for persistent storage. LABEL can be any valid filename, partition label, or GPT name.
-.IP "\fBquickreboot\fR" 4
+.IP "\fBnoeject\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
 This parameter will make live\-boot to show on "/" the ro filesystems (mostly compressed) on "/lib/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation.
diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 698b079..c946ed9 100644
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-05\-06 4.0~a11-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2013\-05\-08 4.0~a12-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in
diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index 48ff6f2..d4ca1f7 100644
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 08.05.2013 4.0~a12\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
@@ -225,7 +225,7 @@ correspondientes. Por defecto es "file,filesystem".
 live\-boot utilizará el nombre "LABEL" en lugar de "persistence" cuando
 busque medios de almacenamiento persistente. LABEL puede ser cualquier
 nombre de fichero, etiqueta de una partición or nombre GPT.
-.IP \fBquickreboot\fP 4
+.IP \fBnoeject\fP 4
 Esta opción hace que live\-boot reinicie sin tratar de expulsar los medios y
 sin pedirle al usuario que extraiga el dispositivo usado para arrancar.
 .IP \fBshowmounts\fP 4
diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index 92ef054..5ae3624 100644
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 08.05.2013 4.0~a12\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 00faf05..e4ac683 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
 "PO-Revision-Date: 2013-04-13 16:48+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\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 "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -512,7 +512,7 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:103 en/live-boot.7:125
 #, no-wrap
 msgid "B<noeject>"
 msgstr ""
@@ -666,12 +666,6 @@ msgid ""
 "label, or GPT name."
 msgstr ""
 
-#. type: IP
-#: en/live-boot.7:125
-#, no-wrap
-msgid "B<quickreboot>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-boot.7:127
 msgid ""
diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index 63b0b03..2fa6a16 100644
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
 "PO-Revision-Date: 2013-04-13 16:48+0100\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\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 "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index c05cd2f..ce4c329 100644
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
 "PO-Revision-Date: 2013-04-13 22:38+0100\n"
 "Last-Translator: Carlos Zuferri <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 "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
@@ -621,7 +621,7 @@ msgstr ""
 "syslinux) se ha instalado con persistencia habilitada."
 
 #. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:103 en/live-boot.7:125
 #, no-wrap
 msgid "B<noeject>"
 msgstr "B<noeject>"
@@ -815,12 +815,6 @@ msgstr ""
 "busque medios de almacenamiento persistente. LABEL puede ser cualquier "
 "nombre de fichero, etiqueta de una partición or nombre GPT."
 
-#. type: IP
-#: en/live-boot.7:125
-#, no-wrap
-msgid "B<quickreboot>"
-msgstr "B<quickreboot>"
-
 #. type: Plain text
 #: en/live-boot.7:127
 msgid ""
diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index b349e5d..fef3743 100644
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
 "PO-Revision-Date: 2013-04-13 16:38+0100\n"
 "Last-Translator: Carlos Zuferri <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 "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 120aeea..fe2760a 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: 2013-05-06 14:23+0300\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-05-06"
+msgid "2013-05-08"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a11-1"
+msgid "4.0~a12-1"
 msgstr ""
 
 #. type: TH
@@ -513,7 +513,7 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-boot.7:103
+#: en/live-boot.7:103 en/live-boot.7:125
 #, no-wrap
 msgid "B<noeject>"
 msgstr ""
@@ -667,12 +667,6 @@ msgid ""
 "label, or GPT name."
 msgstr ""
 
-#. type: IP
-#: en/live-boot.7:125
-#, no-wrap
-msgid "B<quickreboot>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-boot.7:127
 msgid ""
diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 517d088..62c4044 100644
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2013-05-06"
+msgid "2013-05-08"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "4.0~a11-1"
+msgid "4.0~a12-1"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 682959d..8776a7d 100755
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -32,12 +32,6 @@ Live ()
 		. /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
 
diff --git a/scripts/boot/9990-mount-http.sh b/scripts/boot/9990-mount-http.sh
index b557404..9c01482 100755
--- a/scripts/boot/9990-mount-http.sh
+++ b/scripts/boot/9990-mount-http.sh
@@ -50,6 +50,13 @@ do_httpmount ()
 						else
 							FUSE_MOUNT="httpfs"
 						fi
+
+						if [ -n "${FUSE_MOUNT}" ] && [ -x /bin/mount.util-linux ]
+						then
+							# fuse does not work with klibc mount
+							ln -f /bin/mount.util-linux /bin/mount
+						fi
+
 						modprobe fuse
 						$FUSE_MOUNT "${url}" "${dest}"
 						ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"