From b240d98d789fdce75a85a63dcbc0a5008b003d04 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 2 Oct 2012 10:40:15 +0200 Subject: [PATCH] Adding upstream version 3.0~b6. --- VERSION | 2 +- backends/initramfs-tools/live.hook | 4 +++ manpages/de/live-boot.de.7 | 2 +- manpages/de/persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 2 +- manpages/es/persistence.conf.es.5 | 2 +- manpages/po/de/live-boot.7.po | 12 ++++----- manpages/po/de/persistence.conf.5.po | 12 ++++----- manpages/po/es/live-boot.7.po | 12 ++++----- manpages/po/es/persistence.conf.5.po | 12 ++++----- manpages/pot/live-boot.7.pot | 6 ++--- manpages/pot/persistence.conf.5.pot | 6 ++--- scripts/boot/9990-misc-helpers.sh | 22 ++++++++-------- scripts/boot/9990-overlay.sh | 50 +++++++++++++++++------------------- scripts/boot/{README => FIXME} | 0 17 files changed, 75 insertions(+), 75 deletions(-) rename scripts/boot/{README => FIXME} (100%) diff --git a/VERSION b/VERSION index 80d09e5..f4d2505 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~b5-1 +3.0~b6-1 diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 382e161..738257b 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -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 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index b3aef0f..8116112 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 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 diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 index 444a903..cbac9e9 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 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 diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 730872d..cebe297 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -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 diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index f2d02c6..83b022c 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -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 diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index ae4f00f..6af0f8e 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 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 diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 6ac9b32..3f13b77 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 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 diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index d87e6c6..d24cbed 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~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 \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-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 diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index d7c6c91..6096946 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 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 \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-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 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index ea35186..6e43a91 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 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» \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-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 diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 866b924..3fe87c3 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 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» \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-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 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index cc1b4d0..0ff156a 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-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 \n" "Language-Team: LANGUAGE \n" @@ -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 diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index f9c7efb..760a53c 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: 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 \n" "Language-Team: LANGUAGE \n" @@ -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 diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index c5bcaa0..3455045 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -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 @@ -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 @@ -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" diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 55254c7..13c1a0c 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -36,7 +36,7 @@ setup_unionfs () croot="/" # Let's just mount the read-only file systems first - rofslist="" + rootfslist="" if [ -z "${PLAIN_ROOT}" ] then @@ -101,7 +101,7 @@ setup_unionfs () if [ -d "${image}" ] then # it is a plain directory: do nothing - rofslist="${image} ${rofslist}" + rootfslist="${image} ${rootfslist}" elif [ -f "${image}" ] then if losetup --help 2>&1 | grep -q -- "-r\b" @@ -126,12 +126,12 @@ setup_unionfs () case "${UNIONTYPE}" in unionmount) mpoint="${rootmnt}" - rofslist="${rootmnt} ${rofslist}" + rootfslist="${rootmnt} ${rootfslist}" ;; *) mpoint="${croot}/${imagename}" - rofslist="${mpoint} ${rofslist}" + rootfslist="${mpoint} ${rootfslist}" ;; esac @@ -147,7 +147,7 @@ setup_unionfs () log_begin_msg "Mounting \"${image_directory}\" on \"${croot}/filesystem\"" mount -t $(get_fstype "${image_directory}") -o ro,noatime "${image_directory}" "${croot}/filesystem" || \ panic "Can not mount ${image_directory} on ${croot}/filesystem" && \ - rofslist="${croot}/filesystem ${rofslist}" + rootfslist="${croot}/filesystem ${rootfslist}" # probably broken: mount -o bind ${croot}/filesystem $mountpoint log_end_msg @@ -289,19 +289,19 @@ setup_unionfs () fi fi - rofscount=$(echo ${rofslist} |wc -w) + rootfscount=$(echo ${rootfslist} |wc -w) - rofs=${rofslist%% } + rootfs=${rootfslist%% } if [ -n "${EXPOSED_ROOT}" ] then - if [ ${rofscount} -ne 1 ] + if [ ${rootfscount} -ne 1 ] then - panic "only one RO file system supported with exposedroot: ${rofslist}" + panic "only one RO file system supported with exposedroot: ${rootfslist}" fi - mount --bind ${rofs} ${rootmnt} || \ - panic "bind mount of ${rofs} failed" + mount --bind ${rootfs} ${rootmnt} || \ + panic "bind mount of ${rootfs} failed" if [ -z "${SKIP_UNION_MOUNTS}" ] then @@ -329,13 +329,13 @@ setup_unionfs () mount_full $unionmountopts "${unionmountpoint}" else cow_dir="/live/overlay${dir}" - rofs_dir="${rofs}${dir}" + rootfs_dir="${rootfs}${dir}" mkdir -p ${cow_dir} if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] then - do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rofs_dir} + do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir} else - do_union ${unionmountpoint} ${cow_dir} ${rofs_dir} + do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir} fi fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}" done @@ -349,24 +349,24 @@ setup_unionfs () chmod 1777 "${rootmnt}"/tmp fi - live_rofs_list="" - for d in ${rofslist} + live_rootfs_list="" + for d in ${rootfslist} do - live_rofs="/live/rofs/${d##*/}" - live_rofs_list="${live_rofs_list} ${live_rofs}" - mkdir -p "${live_rofs}" + live_rootfs="/live/rootfs/${d##*/}" + live_rootfs_list="${live_rootfs_list} ${live_rootfs}" + mkdir -p "${live_rootfs}" case d in *.dir) - # do nothing # mount -o bind "${d}" "${live_rofs}" + # do nothing # mount -o bind "${d}" "${live_rootfs}" ;; *) case "${UNIONTYPE}" in unionfs-fuse) - mount -o bind "${d}" "${live_rofs}" + mount -o bind "${d}" "${live_rootfs}" ;; *) - mount -o move "${d}" "${live_rofs}" + mount -o move "${d}" "${live_rootfs}" ;; esac ;; @@ -399,12 +399,8 @@ setup_unionfs () done fi - # make /root/lib/live writable for moving filesystems - mkdir -p "${rootmnt}/lib/live" - mount -t tmpfs tmpfs "${rootmnt}/lib/live" - # move all mountpoints to root filesystem - for _DIRECTORY in rofs persistence + for _DIRECTORY in rootfs persistence do if [ -d "/live/${_DIRECTORY}" ] then diff --git a/scripts/boot/README b/scripts/boot/FIXME similarity index 100% rename from scripts/boot/README rename to scripts/boot/FIXME -- 2.1.4