Skip to content

Commit

Permalink
Adding upstream version 3.0~b6.
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniel-baumann
daniel-baumann committed Oct 2, 2012
1 parent 3e8ed74 commit b240d98
Show file tree
Hide file tree
Showing 17 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
@@ -1 +1 @@
3.0~b5-1
3.0~b6-1
4 changes: 4 additions & 0 deletions backends/initramfs-tools/live.hook
View file
Expand Up @@ -84,6 +84,10 @@ fi
manual_add_modules ext3
manual_add_modules ext4

# Filesystem: hfs/hfsplus
manual_add_modules hfs
manual_add_modules hfsplus

# Filesystem: jffs2
manual_add_modules jffs2

Expand Down
2 changes: 1 addition & 1 deletion manpages/de/live-boot.de.7
View file
Expand Up @@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BOOT 7 30.09.2012 3.0~b5\-1 "Debian Live Project"
.TH LIVE\-BOOT 7 02.10.2012 3.0~b6\-1 "Debian Live Project"

.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
Expand Down
2 changes: 1 addition & 1 deletion manpages/de/persistence.conf.de.5
View file
Expand Up @@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BOOT conf 30.09.2012 3.0~b5\-1 "Debian Live Project"
.TH LIVE\-BOOT conf 02.10.2012 3.0~b6\-1 "Debian Live Project"

.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
Expand Down
2 changes: 1 addition & 1 deletion manpages/en/live-boot.7
View file
@@ -1,4 +1,4 @@
.TH LIVE\-BOOT 7 2012\-09\-30 3.0~b5-1 "Debian Live Project"
.TH LIVE\-BOOT 7 2012\-10\-02 3.0~b6-1 "Debian Live Project"

.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
Expand Down
2 changes: 1 addition & 1 deletion manpages/en/persistence.conf.5
View file
@@ -1,4 +1,4 @@
.TH LIVE\-BOOT conf 2012\-09\-30 3.0~b5-1 "Debian Live Project"
.TH LIVE\-BOOT conf 2012\-10\-02 3.0~b6-1 "Debian Live Project"

.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
Expand Down
2 changes: 1 addition & 1 deletion manpages/es/live-boot.es.7
View file
Expand Up @@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BOOT 7 30.09.2012 3.0~b5\-1 "Proyecto Debian Live"
.TH LIVE\-BOOT 7 02.10.2012 3.0~b6\-1 "Proyecto Debian Live"

.SH NOMBRE
\fBlive\-boot\fP \- Scripts de Arranque del Sistema
Expand Down
2 changes: 1 addition & 1 deletion manpages/es/persistence.conf.es.5
View file
Expand Up @@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BOOT conf 30.09.2012 3.0~b5\-1 "Proyecto Debian Live"
.TH LIVE\-BOOT conf 02.10.2012 3.0~b6\-1 "Proyecto Debian Live"

.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/de/live-boot.7.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b5-1\n"
"POT-Creation-Date: 2012-09-30 10:07+0300\n"
"Project-Id-Version: live-boot 3.0~b6-1\n"
"POT-Creation-Date: 2012-10-02 10:38+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
Expand All @@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-09-30"
msgstr "30.09.2012"
msgid "2012-10-02"
msgstr "02.10.2012"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b5-1"
msgstr "3.0~b5-1"
msgid "3.0~b6-1"
msgstr "3.0~b6-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/de/persistence.conf.5.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b5-1\n"
"POT-Creation-Date: 2012-09-30 10:07+0300\n"
"Project-Id-Version: live-boot 3.0~b6-1\n"
"POT-Creation-Date: 2012-10-02 10:38+0300\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
Expand All @@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-09-30"
msgstr "30.09.2012"
msgid "2012-10-02"
msgstr "02.10.2012"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b5-1"
msgstr "3.0~b5-1"
msgid "3.0~b6-1"
msgstr "3.0~b6-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/es/live-boot.7.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b5-1\n"
"POT-Creation-Date: 2012-09-30 10:07+0300\n"
"Project-Id-Version: live-boot 3.0~b6-1\n"
"POT-Creation-Date: 2012-10-02 10:38+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"
Expand All @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-09-30"
msgstr "30.09.2012"
msgid "2012-10-02"
msgstr "02.10.2012"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b5-1"
msgstr "3.0~b5-1"
msgid "3.0~b6-1"
msgstr "3.0~b6-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
12 changes: 6 additions & 6 deletions manpages/po/es/persistence.conf.5.po
View file
Expand Up @@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~b5-1\n"
"POT-Creation-Date: 2012-09-30 10:07+0300\n"
"Project-Id-Version: live-boot 3.0~b6-1\n"
"POT-Creation-Date: 2012-10-02 10:38+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"
Expand All @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-09-30"
msgstr "30.09.2012"
msgid "2012-10-02"
msgstr "02.10.2012"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b5-1"
msgstr "3.0~b5-1"
msgid "3.0~b6-1"
msgstr "3.0~b6-1"

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
Expand Down
6 changes: 3 additions & 3 deletions manpages/pot/live-boot.7.pot
View file
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
"POT-Creation-Date: 2012-09-30 10:07+0300\n"
"POT-Creation-Date: 2012-10-02 10:38+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"
Expand All @@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-09-30"
msgid "2012-10-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b5-1"
msgid "3.0~b6-1"
msgstr ""

#. type: TH
Expand Down
6 changes: 3 additions & 3 deletions manpages/pot/persistence.conf.5.pot
View file
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
"POT-Creation-Date: 2012-09-30 10:07+0300\n"
"POT-Creation-Date: 2012-10-02 10:38+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"
Expand All @@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "2012-09-30"
msgid "2012-10-02"
msgstr ""

#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "3.0~b5-1"
msgid "3.0~b6-1"
msgstr ""

#. type: TH
Expand Down
22 changes: 11 additions & 11 deletions scripts/boot/9990-misc-helpers.sh
View file
Expand Up @@ -1442,23 +1442,23 @@ activate_custom_mounts ()
fi

# 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=""
# ignore the loop below and set rootfs_dest_backing=$dest
local rootfs_dest_backing=""
if [ -n "${opt_link}"]
then
for d in /live/rofs/*
for d in /live/rootfs/*
do
if [ -n "${rootmnt}" ]
then
rofs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
rootfs_dest_backing="${d}/$(echo ${dest} | sed -e "s|${rootmnt}||")"
else
rofs_dest_backing="${d}/${dest}"
rootfs_dest_backing="${d}/${dest}"
fi
if [ -d "${rofs_dest_backing}" ]
if [ -d "${rootfs_dest_backing}" ]
then
break
else
rofs_dest_backing=""
rootfs_dest_backing=""
fi
done
fi
Expand All @@ -1481,18 +1481,18 @@ activate_custom_mounts ()
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
do_union ${links_source} ${cow_dir} ${source} ${rofs_dest_backing}
do_union ${links_source} ${cow_dir} ${source} ${rootfs_dest_backing}
link_files ${links_source} ${dest} ${rootmnt}
elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
do_union ${dest} ${source} ${rofs_dest_backing}
do_union ${dest} ${source} ${rootfs_dest_backing}
elif [ -n "${opt_bind}" ] && [ -z "${PERSISTENCE_READONLY}" ]
then
mount --bind "${source}" "${dest}"
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
# in read-only mode, but note that rootfs_dest_backing
# is non-empty (and necessary) only for unions
if [ -n "${rootmnt}" ]
then
Expand All @@ -1512,7 +1512,7 @@ activate_custom_mounts ()
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
chmod_ref "${source}" "${cow_dir}"
do_union ${dest} ${cow_dir} ${source} ${rofs_dest_backing}
do_union ${dest} ${cow_dir} ${source} ${rootfs_dest_backing}
fi

PERSISTENCE_IS_ON="1"
Expand Down

0 comments on commit b240d98

Please sign in to comment.