Adding upstream version 3.0~b5.

diff --git a/VERSION b/VERSION
index fcdc2fc..80d09e5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~b4-1
+3.0~b5-1

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 0c8f57b..b3aef0f 100644 (file)
--- 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 27.09.2012 3.0~b4\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 30.09.2012 3.0~b5\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts

diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index 6b038fe..444a903 100644 (file)
--- 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 27.09.2012 3.0~b4\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 30.09.2012 3.0~b5\-1 "Debian Live 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 9f1756a..730872d 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-09\-27 3.0~b4-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-09\-30 3.0~b5-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 311fa5c..f2d02c6 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-09\-27 3.0~b4-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-09\-30 3.0~b5-1 "Debian Live 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 abd67f3..ae4f00f 100644 (file)
--- 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 27.09.2012 3.0~b4\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 30.09.2012 3.0~b5\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index ea7ea84..6ac9b32 100644 (file)
--- 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 27.09.2012 3.0~b4\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 30.09.2012 3.0~b5\-1 "Proyecto Debian Live"
 
 .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 60b83fb..d87e6c6 100644 (file)
--- 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 3.0~b4-1\n"
-"POT-Creation-Date: 2012-09-27 13:22+0300\n"
+"Project-Id-Version: live-boot 3.0~b5-1\n"
+"POT-Creation-Date: 2012-09-30 10:07+0300\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-09-27"
-msgstr "27.09.2012"
+msgid "2012-09-30"
+msgstr "30.09.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b4-1"
-msgstr "3.0~b4-1"
+msgid "3.0~b5-1"
+msgstr "3.0~b5-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index b3b14a0..d7c6c91 100644 (file)
--- 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 3.0~b4-1\n"
-"POT-Creation-Date: 2012-09-27 13:22+0300\n"
+"Project-Id-Version: live-boot 3.0~b5-1\n"
+"POT-Creation-Date: 2012-09-30 10:07+0300\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-09-27"
-msgstr "27.09.2012"
+msgid "2012-09-30"
+msgstr "30.09.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b4-1"
-msgstr "3.0~b4-1"
+msgid "3.0~b5-1"
+msgstr "3.0~b5-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 3b4916c..ea35186 100644 (file)
--- 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 3.0~b4-1\n"
-"POT-Creation-Date: 2012-09-27 13:22+0300\n"
+"Project-Id-Version: live-boot 3.0~b5-1\n"
+"POT-Creation-Date: 2012-09-30 10:07+0300\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-09-27"
-msgstr "27.09.2012"
+msgid "2012-09-30"
+msgstr "30.09.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b4-1"
-msgstr "3.0~b4-1"
+msgid "3.0~b5-1"
+msgstr "3.0~b5-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index ebfda64..866b924 100644 (file)
--- 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 3.0~b4-1\n"
-"POT-Creation-Date: 2012-09-27 13:22+0300\n"
+"Project-Id-Version: live-boot 3.0~b5-1\n"
+"POT-Creation-Date: 2012-09-30 10:07+0300\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-09-27"
-msgstr "27.09.2012"
+msgid "2012-09-30"
+msgstr "30.09.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b4-1"
-msgstr "3.0~b4-1"
+msgid "3.0~b5-1"
+msgstr "3.0~b5-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 f2e9b58..cc1b4d0 100644 (file)
--- 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-09-27 13:22+0300\n"
+"POT-Creation-Date: 2012-09-30 10:07+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 "2012-09-27"
+msgid "2012-09-30"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b4-1"
+msgid "3.0~b5-1"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index df1e920..f9c7efb 100644 (file)
--- 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: 2012-09-27 13:22+0300\n"
+"POT-Creation-Date: 2012-09-30 10:07+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 "2012-09-27"
+msgid "2012-09-30"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b4-1"
+msgid "3.0~b5-1"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 7a6ce43..85f1b62 100755 (executable)
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -203,11 +203,6 @@ Cmdline_old ()
                                export QUICKUSBMODULES
                                ;;
 
-                       showmounts)
-                               SHOWMOUNTS="true"
-                               export SHOWMOUNTS
-                               ;;
-
                        todisk=*)
                                TODISK="${_PARAMETER#todisk=}"
                                export TODISK

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 8283c73..55254c7 100755 (executable)
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -350,34 +350,28 @@ setup_unionfs ()
        fi
 
        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 "${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="/live/rofs/${d##*/}"
-                       live_rofs_list="${live_rofs_list} ${live_rofs}"
-                       mkdir -p "${live_rofs}"
-                       case d in
-                               *.dir)
-                                       # do nothing # mount -o bind "${d}" "${live_rofs}"
-                                       ;;
-                               *)
-                                       case "${UNIONTYPE}" in
-                                               unionfs-fuse)
-                                                       mount -o bind "${d}" "${live_rofs}"
-                                                       ;;
-
-                                               *)
-                                                       mount -o move "${d}" "${live_rofs}"
-                                                       ;;
-                                       esac
-                                       ;;
-                       esac
-               done
-       fi
+       for d in ${rofslist}
+       do
+               live_rofs="/live/rofs/${d##*/}"
+               live_rofs_list="${live_rofs_list} ${live_rofs}"
+               mkdir -p "${live_rofs}"
+               case d in
+                       *.dir)
+                               # do nothing # mount -o bind "${d}" "${live_rofs}"
+                               ;;
+                       *)
+                               case "${UNIONTYPE}" in
+                                       unionfs-fuse)
+                                               mount -o bind "${d}" "${live_rofs}"
+                                               ;;
+
+                                       *)
+                                               mount -o move "${d}" "${live_rofs}"
+                                               ;;
+                               esac
+                               ;;
+               esac
+       done
 
        # Adding custom persistence
        if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ]
@@ -431,4 +425,8 @@ setup_unionfs ()
                mount -o bind /live/overlay "${rootmnt}/lib/live/overlay" || \
                log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/overlay"
 
+        # ensure that a potentially stray tmpfs gets removed
+        # otherways, initramfs-tools is unable to remove /live
+        # and fails to boot
+        umount /live/overlay || true
 }