From 601f25e49f45f4849957c70f3cf0ab77c4be9579 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Sep 2012 14:41:39 +0200 Subject: [PATCH] Adding upstream version 3.0~b3. --- VERSION | 2 +- manpages/de/live-boot.de.7 | 2 +- manpages/de/live-persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/live-persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 2 +- manpages/es/live-persistence.conf.es.5 | 2 +- manpages/po/de/live-boot.7.po | 12 ++++++------ manpages/po/de/live-persistence.conf.5.po | 12 ++++++------ manpages/po/es/live-boot.7.po | 16 ++++++++-------- manpages/po/es/live-persistence.conf.5.po | 16 ++++++++-------- manpages/pot/live-boot.7.pot | 6 +++--- manpages/pot/live-persistence.conf.5.pot | 6 +++--- scripts/boot/9990-main.sh | 9 +++------ scripts/boot/9990-misc-helpers.sh | 2 ++ scripts/boot/9990-overlay.sh | 25 ++++++++++++++++++++++--- 16 files changed, 68 insertions(+), 50 deletions(-) diff --git a/VERSION b/VERSION index fd9fab5..e4179e0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~b2-1 +3.0~b3-1 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index ba846a9..d2b0e5f 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 24.08.2012 3.0~b2\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 26.09.2012 3.0~b3\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5 index 47abda0..f160b4e 100644 --- a/manpages/de/live-persistence.conf.de.5 +++ b/manpages/de/live-persistence.conf.de.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 24.08.2012 3.0~b2\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 26.09.2012 3.0~b3\-1 "Debian Live Project" .SH NAME \fBlive\-persistence.conf\fP \- Configuration file for persistence media in diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index c33e261..8fd08a4 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2012\-08\-24 3.0~b2-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-09\-26 3.0~b3-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5 index 28839d7..92fa09f 100644 --- a/manpages/en/live-persistence.conf.5 +++ b/manpages/en/live-persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2012\-08\-24 3.0~b2-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-09\-26 3.0~b3-1 "Debian Live Project" .SH NAME \fBlive-persistence.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 25007af..ce14d4d 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 24.08.2012 3.0~b2\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 26.09.2012 3.0~b3\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5 index 941e567..757363e 100644 --- a/manpages/es/live-persistence.conf.es.5 +++ b/manpages/es/live-persistence.conf.es.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 24.08.2012 3.0~b2\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 26.09.2012 3.0~b3\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index e54a1f0..0369a03 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 3.0~b2-1\n" -"POT-Creation-Date: 2012-08-24 12:36+0300\n" +"Project-Id-Version: live-boot 3.0~b3-1\n" +"POT-Creation-Date: 2012-09-26 14:38+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-08-24" -msgstr "24.08.2012" +msgid "2012-09-26" +msgstr "26.09.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~b2-1" -msgstr "3.0~b2-1" +msgid "3.0~b3-1" +msgstr "3.0~b3-1" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po index a7e2f03..539eede 100644 --- a/manpages/po/de/live-persistence.conf.5.po +++ b/manpages/po/de/live-persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~b2-1\n" -"POT-Creation-Date: 2012-08-24 12:36+0300\n" +"Project-Id-Version: live-boot 3.0~b3-1\n" +"POT-Creation-Date: 2012-09-26 14:38+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-08-24" -msgstr "24.08.2012" +msgid "2012-09-26" +msgstr "26.09.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~b2-1" -msgstr "3.0~b2-1" +msgid "3.0~b3-1" +msgstr "3.0~b3-1" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 61a92f8..3cc4b9c 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -4,12 +4,12 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~b2-1\n" -"POT-Creation-Date: 2012-08-24 12:36+0300\n" +"Project-Id-Version: live-boot 3.0~b3-1\n" +"POT-Creation-Date: 2012-09-26 14:38+0300\n" "PO-Revision-Date: 2012-06-07 20:29+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" -"Language-Team: Debian Live \n" -"Language: Spanish\n" +"Language-Team: none\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-08-24" -msgstr "24.08.2012" +msgid "2012-09-26" +msgstr "26.09.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~b2-1" -msgstr "3.0~b2-1" +msgid "3.0~b3-1" +msgstr "3.0~b3-1" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 diff --git a/manpages/po/es/live-persistence.conf.5.po b/manpages/po/es/live-persistence.conf.5.po index 444fc21..37f4797 100644 --- a/manpages/po/es/live-persistence.conf.5.po +++ b/manpages/po/es/live-persistence.conf.5.po @@ -4,12 +4,12 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~b2-1\n" -"POT-Creation-Date: 2012-08-24 12:36+0300\n" +"Project-Id-Version: live-boot 3.0~b3-1\n" +"POT-Creation-Date: 2012-09-26 14:38+0300\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" -"Language-Team: Debian Live \n" -"Language: Spanish\n" +"Language-Team: none\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-08-24" -msgstr "24.08.2012" +msgid "2012-09-26" +msgstr "26.09.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~b2-1" -msgstr "3.0~b2-1" +msgid "3.0~b3-1" +msgstr "3.0~b3-1" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index b4bc947..1054a7a 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-08-24 12:36+0300\n" +"POT-Creation-Date: 2012-09-26 14:38+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-08-24" +msgid "2012-09-26" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~b2-1" +msgid "3.0~b3-1" msgstr "" #. type: TH diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot index 7fdf678..227f5c7 100644 --- a/manpages/pot/live-persistence.conf.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-08-24 12:36+0300\n" +"POT-Creation-Date: 2012-09-26 14:38+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-08-24" +msgid "2012-09-26" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~b2-1" +msgid "3.0~b3-1" msgstr "" #. type: TH diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index 5732b2a..ba77dd4 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -146,11 +146,8 @@ Main () esac # Move to the new root filesystem so that programs there can get at it. - if [ ! -d /root/live/image ] - then - mkdir -p /root/live/image - mount --move /live/image /root/live/image - fi + mkdir -p /root/live/image + mount --move /live/image /root/live/image # aufs2 in kernel versions around 2.6.33 has a regression: # directories can't be accessed when read for the first the time, @@ -159,7 +156,7 @@ Main () 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 ] + if [ -d /live/findiso ] then mkdir -p /root/live/findiso mount -n --move /live/findiso /root/live/findiso diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 117876f..4429c33 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -911,7 +911,9 @@ probe_for_file_name () then echo ${ret} else + # unmount and remove mountpoint umount ${backing} > /dev/null 2>&1 || true + rmdir ${backing} > /dev/null 2>&1 || true fi } diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 597ff50..d377d34 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -405,11 +405,30 @@ setup_unionfs () done fi + # make /root/live writable for moving filesystems 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" + mount -t tmpfs tmpfs "${rootmnt}/live" + + # move all mountpoints to root filesystem + for _DIRECTORY in rofs persistence + do + if [ -d "/live/${_DIRECTORY}" ] + then + mkdir -p "${rootmnt}/live/${_DIRECTORY}" + + for _MOUNT in $(ls /live/${_DIRECTORY}) + do + mkdir -p "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" + mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ + mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" || \ + log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/live/${_DIRECTORY}/${_MOUNT}" + done + fi + done - # shows cow fs on /overlay (FIXME: do we still need/want this? probably yes) 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" + mount -o move /live/overlay "${rootmnt}/live/overlay" > /dev/null 2>&1 || \ + mount -o bind /overlay "${rootmnt}/live/overlay" || \ + log_warning_msg "W: failed to mount /overlay to ${rootmnt}/live/overlay" } -- 2.1.4