From 20a36dd1e76d50c02968a50212a59c34efb3e79a Mon Sep 17 00:00:00 2001 From: Tails developers Date: Wed, 24 Dec 2014 12:28:30 +0000 Subject: [PATCH 01/31] Fixing name of overlayfs kernel module for inclusion in the initramfs (Closes: #773868). --- backend/initramfs-tools/live.hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook index 76f4218..f48cb5a 100755 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@ -107,7 +107,7 @@ manual_add_modules unlzma # Filesystem: aufs/overlayfs/unionfs manual_add_modules aufs -manual_add_modules overlayfs +manual_add_modules overlay manual_add_modules unionfs # Filesystem: unionfs-fuse From 44e7b72fa71425b02ec770b1f3429b27a5cf6c51 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:09:04 +0100 Subject: [PATCH 02/31] Using 'overlay' instead of 'overlayfs' everywhere, without backwards compatibility (Closes: #773881). When overlayfs got merged into kernel mainline it was renamed to overlay. We don't provide backwards compatibility since overlayfs support was experimental and only with non-debian default kernels available. --- backend/initramfs-tools/live.hook | 2 +- components/9990-misc-helpers.sh | 10 +++++----- components/9990-overlay.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook index f48cb5a..234f334 100755 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@ -105,7 +105,7 @@ manual_add_modules squashfs manual_add_modules sqlzma manual_add_modules unlzma -# Filesystem: aufs/overlayfs/unionfs +# Filesystem: aufs/overlay/unionfs manual_add_modules aufs manual_add_modules overlay manual_add_modules unionfs diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index fb139ec..70f907a 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1322,15 +1322,15 @@ do_union () pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true ) ;; - overlayfs) - # XXX: can multiple unionro be used? (overlayfs only handles two dirs, but perhaps they can be chained?) - # XXX: and can unionro be optional? i.e. can overlayfs skip lowerdir? + overlay) + # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) + # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? if echo ${unionro} | grep -q " " then - panic "Multiple lower filesystems are currently not supported with overlayfs (unionro = ${unionro})." + panic "Multiple lower filesystems are currently not supported with overlay (unionro = ${unionro})." elif [ -z "${unionro}" ] then - panic "Overlayfs needs at least one lower filesystem (read-only branch)." + panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 52c045a..e22b905 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -9,7 +9,7 @@ setup_unionfs () addimage_directory="${3}" case ${UNIONTYPE} in - aufs|unionfs|overlayfs) + aufs|unionfs|overlay) modprobe -q -b ${UNIONTYPE} if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] From ec9bd07c900e13d606445518a87e0326902d5815 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:16:36 +0100 Subject: [PATCH 03/31] Dropping unionfs-fuse support: * unionfs-fuse itself has been always very buggy for us. * unionfs-fuse code in live-boot as been experimental at best. * the FUSE implementation is horribly slow due to the nature of FUSE (~10min to boot a live system with unionfs-fuse compared to <<1min with aufs). * and last but not least, there's overlay in kernel mainline now. --- backend/initramfs-tools/live.hook | 6 ------ components/9990-main.sh | 15 --------------- components/9990-misc-helpers.sh | 21 --------------------- components/9990-overlay.sh | 25 ++++--------------------- debian/control | 1 - debian/live-boot.bug-script | 2 +- 6 files changed, 5 insertions(+), 65 deletions(-) diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook index 234f334..55b0207 100755 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@ -110,12 +110,6 @@ manual_add_modules aufs manual_add_modules overlay manual_add_modules unionfs -# Filesystem: unionfs-fuse -if [ -x /usr/bin/unionfs-fuse ] -then - copy_exec /usr/bin/unionfs-fuse /bin -fi - # Filesystem: vfat manual_add_modules nls_cp437 manual_add_modules nls_iso8859-1 diff --git a/components/9990-main.sh b/components/9990-main.sh index 85b8a1d..512c624 100755 --- a/components/9990-main.sh +++ b/components/9990-main.sh @@ -148,15 +148,6 @@ Live () log_end_msg - # unionfs-fuse needs /dev to be bind-mounted for the duration of - # live-bottom; udev's init script will take care of things after that - case "${UNIONTYPE}" in - unionfs-fuse) - mount -n -o bind /dev "${rootmnt}/dev" - ;; - esac - - # aufs2 in kernel versions around 2.6.33 has a regression: # directories can't be accessed when read for the first the time, # causing a failure for example when accessing /var/lib/fai @@ -201,12 +192,6 @@ Live () Swap - case "${UNIONFS}" in - unionfs-fuse) - umount "${rootmnt}/dev" - ;; - esac - exec 1>&6 6>&- exec 2>&7 7>&- kill ${tailpid} diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 70f907a..fcd2b07 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1294,11 +1294,6 @@ do_union () noxino_opt="noxino" ;; - unionfs-fuse) - rw_opt="RW" - ro_opt="RO" - ;; - *) rw_opt="rw" ro_opt="ro" @@ -1306,22 +1301,6 @@ do_union () esac case "${UNIONTYPE}" in - unionfs-fuse) - unionmountopts="-o cow -o noinitgroups -o default_permissions -o allow_other -o use_ino -o suid" - unionmountopts="${unionmountopts} ${unionrw}=${rw_opt}" - if [ -n "${unionro}" ] - then - for rofs in ${unionro} - do - unionmountopts="${unionmountopts}:${rofs}=${ro_opt}" - done - fi - ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384 - unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \ - ( mkdir -p /run/sendsigs.omit.d - pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true ) - ;; - overlay) # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index e22b905..9d26934 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -10,21 +10,12 @@ setup_unionfs () case ${UNIONTYPE} in aufs|unionfs|overlay) - modprobe -q -b ${UNIONTYPE} - - if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] + if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" then - echo "${UNIONTYPE} not available, falling back to unionfs-fuse." - echo "This might be really slow." - - UNIONTYPE="unionfs-fuse" + panic "${UNIONTYPE} not available." fi - ;; - esac - case "${UNIONTYPE}" in - unionfs-fuse) - modprobe fuse + modprobe -q -b ${UNIONTYPE} ;; esac @@ -358,15 +349,7 @@ setup_unionfs () # do nothing # mount -o bind "${d}" "${live_rootfs}" ;; *) - case "${UNIONTYPE}" in - unionfs-fuse) - mount -o bind "${d}" "${live_rootfs}" - ;; - - *) - mount -o move "${d}" "${live_rootfs}" - ;; - esac + mount -o move "${d}" "${live_rootfs}" ;; esac done diff --git a/debian/control b/debian/control index 9fcef5b..22a06d0 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,6 @@ Suggests: curlftpfs, cryptsetup, httpfs2, - unionfs-fuse, wget, Description: Live System Boot Components The Live Systems project maintains the components to build Debian based Live diff --git a/debian/live-boot.bug-script b/debian/live-boot.bug-script index e3f6d36..063ead8 100644 --- a/debian/live-boot.bug-script +++ b/debian/live-boot.bug-script @@ -7,7 +7,7 @@ dpkg -l busybox busybox-initramfs initramfs-tools udev dpkg -l rsync uuid-runtime # Checking suggests -dpkg -l curlftpfs cryptsetup httpfs2 unionfs-fuse wget +dpkg -l curlftpfs cryptsetup httpfs2 wget # Checking other packages dpkg -l plymouth From ad63444c66cae26ee32136f9073aa5fc9cf04690 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:23:33 +0100 Subject: [PATCH 04/31] Dropping unionfs support, long superseeded with aufs. --- backend/initramfs-tools/live.hook | 3 +-- components/9990-overlay.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook index 55b0207..fc3d6b4 100755 --- a/backend/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@ -105,10 +105,9 @@ manual_add_modules squashfs manual_add_modules sqlzma manual_add_modules unlzma -# Filesystem: aufs/overlay/unionfs +# Filesystem: aufs/overlay manual_add_modules aufs manual_add_modules overlay -manual_add_modules unionfs # Filesystem: vfat manual_add_modules nls_cp437 diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 9d26934..d293ead 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -9,7 +9,7 @@ setup_unionfs () addimage_directory="${3}" case ${UNIONTYPE} in - aufs|unionfs|overlay) + aufs|overlay) if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" then panic "${UNIONTYPE} not available." From 7565361fef5dda9d60bb7540e408630caded4bd1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:29:09 +0100 Subject: [PATCH 05/31] Dropping unionmount support, superseeded with overlay in mainline kernel. --- components/9990-overlay.sh | 74 +++++++++++++------------------------- 1 file changed, 24 insertions(+), 50 deletions(-) diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index d293ead..316a21d 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -114,17 +114,8 @@ setup_unionfs () ;; esac - case "${UNIONTYPE}" in - unionmount) - mpoint="${rootmnt}" - rootfslist="${rootmnt} ${rootfslist}" - ;; - - *) - mpoint="${croot}/${imagename}" - rootfslist="${mpoint} ${rootfslist}" - ;; - esac + mpoint="${croot}/${imagename}" + rootfslist="${mpoint} ${rootfslist}" mkdir -p "${mpoint}" log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\"" @@ -254,27 +245,24 @@ setup_unionfs () cow_mountopt="rw,noatime,mode=755" fi - if [ "${UNIONTYPE}" != "unionmount" ] + if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] then - if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] - then - mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay" - root_backing="/live/persistence/$(basename ${cowdevice})-root" - mkdir -p ${root_backing} - else - root_backing="/live/overlay" - fi + mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay" + root_backing="/live/persistence/$(basename ${cowdevice})-root" + mkdir -p ${root_backing} + else + root_backing="/live/overlay" + fi - if [ "${cow_fstype}" = "nfs" ] - then - log_begin_msg \ - "Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing}" - nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing} || \ - panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${root_backing}" - else - mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${root_backing} || \ - panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${root_backing}" - fi + if [ "${cow_fstype}" = "nfs" ] + then + log_begin_msg \ + "Trying nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing}" + nfsmount ${nfs_cow_opts} ${cowdevice} ${root_backing} || \ + panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on ${root_backing}" + else + mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} ${root_backing} || \ + panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on ${root_backing}" fi rootfscount=$(echo ${rootfslist} |wc -w) @@ -301,31 +289,17 @@ setup_unionfs () cow_dirs="/" fi - if [ "${cow_fstype}" != "tmpfs" ] && [ "${cow_dirs}" != "/" ] && [ "${UNIONTYPE}" = "unionmount" ] - then - true # FIXME: Maybe it does, I don't really know. - #panic "unionmount does not support subunions (${cow_dirs})." - fi - for dir in ${cow_dirs}; do unionmountpoint="${rootmnt}${dir}" mkdir -p ${unionmountpoint} - if [ "${UNIONTYPE}" = "unionmount" ] + cow_dir="/live/overlay${dir}" + rootfs_dir="${rootfs}${dir}" + mkdir -p ${cow_dir} + if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] then - # FIXME: handle PERSISTENCE_READONLY - unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}" - # unionmount only works with util-linux mount - mount.util-linux $unionmountopts "${unionmountpoint}" + do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir} else - cow_dir="/live/overlay${dir}" - rootfs_dir="${rootfs}${dir}" - mkdir -p ${cow_dir} - if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ] - then - do_union ${unionmountpoint} ${cow_dir} ${root_backing} ${rootfs_dir} - else - do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir} - fi + do_union ${unionmountpoint} ${cow_dir} ${rootfs_dir} fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}" done From c2bad45e991632c647f0c6c542bd4a0514f32fe7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:33:00 +0100 Subject: [PATCH 06/31] Updating manpages for union= boot parameter. --- manpages/en/live-boot.7 | 6 +- manpages/en/persistence.conf.5 | 5 +- manpages/es/live-boot.es.7 | 6 +- manpages/es/persistence.conf.es.5 | 5 +- manpages/ja/live-boot.ja.7 | 6 +- manpages/ja/persistence.conf.ja.5 | 13 +-- manpages/po/es/live-boot.7.po | 12 +-- manpages/po/es/persistence.conf.5.po | 106 ++++++++++++------------- manpages/po/ja/live-boot.7.po | 12 +-- manpages/po/ja/persistence.conf.5.po | 113 +++++++++++++++------------ manpages/pot/live-boot.7.pot | 8 +- manpages/pot/persistence.conf.5.pot | 103 ++++++++++++------------ 12 files changed, 201 insertions(+), 194 deletions(-) diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index eb6aa27..16d11ab 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2-1 "Live Systems Project" +.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2-1 "Live Systems Project" .SH NAME \fBlive\-boot\fR \- System Boot Components @@ -132,8 +132,8 @@ If you boot with the normal quiet parameter, live\-boot hides most messages of i Adding this parameter, live\-boot will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live\-media=DEVICE" boot parameter with the same DEVICE used this time. .IP "\fBtoram\fR" 4 Adding this parameter, live\-boot will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media. -.IP "\fBunion\fR=aufs|unionfs\fR" 4 -By default, live\-boot uses aufs. With this parameter, you can switch to unionfs. +.IP "\fBunion\fR=aufs|overlay\fR" 4 +By default, live\-boot uses aufs. With this parameter, you can switch to overlay. .\" FIXME .\" FIXME diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index 297a624..c0ff914 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2-1 "Live Systems Project" +.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2-1 "Live Systems Project" .SH NAME \fBpersistence.conf\fR \- Configuration file for persistence media in @@ -96,8 +96,7 @@ read-only media. One caveat is that the union will use \fIDIR\fR from the image's read-only file system, not the real file system root, so files created after boot (e.g. by live-config) will not appear in the union. This option will use the union file system specified by -live-boot's \fBunion\fR boot parameter, but is not supported with -\fBunion=unionmount\fR. +live-boot's \fBunion\fR boot parameter. .SH DIRECTORIES .IP "\fB/live/persistence\fR" 4 diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index f83ce79..5f0cec4 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 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2\-1 "Proyecto Live Systems" .SH NOMBRE \fBlive\-boot\fP \- Componentes de Arranque del Sistema @@ -248,10 +248,10 @@ Al añadir este parámetro, live\-boot trata de copiar los medios de sólo lectura enteros en la memoria RAM del ordenador antes de montar el sistema de ficheros raíz. Para esto puede ser necesaria mucha memoria RAM, según el espacio utilizado por los medios de sólo lectura. -.IP \fBunion\fP=aufs|unionfs 4 +.IP \fBunion\fP=aufs|overlay 4 .\" FIXME Por defecto, live\-boot usa aufs. Con este parámetro, se puede cambiar a -unionfs. +overlay. .\" FIXME .SH "FICHEROS (antiguos)" diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 46e7378..9176791 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 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2\-1 "Proyecto Live Systems" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con @@ -106,8 +106,7 @@ es que la unión utilizará el \fIDIR\fP del sistema de ficheros de sólo lectur de la imagen y no de la raíz del sistema de ficheros real, por eso los ficheros que se crean después del arranque (por ejemplo live\-config) no aparecerán en la unión. Esta opción utilizará el sistema de ficheros unión -especificado por el parámetro de arranque \fBunion\fP de live\-boot pero no -tiene soporte si se utiliza \fBunion=unionmount\fP. +especificado por el parámetro de arranque \fBunion\fP de live\-boot. .SH DIRECTORIOS .IP \fB/live/persistence\fP 4 diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7 index 8bcd142..dec688d 100644 --- a/manpages/ja/live-boot.ja.7 +++ b/manpages/ja/live-boot.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-boot\fP \- システム起動構成要素 @@ -183,9 +183,9 @@ live\-boot .IP \fBtoram\fP 4 このパラメータを追加すると、live\-boot はルートファイルシステムをマウントする前に読み取り専用メディア全体をそのコンピュータの RAM にコピーしようとします。その読み取り専用メディアで利用している容量により、これには多くの RAM が必要となるかもしれません。 -.IP \fBunion\fP=aufs|unionfs 4 +.IP \fBunion\fP=aufs|overlay 4 .\" FIXME -デフォルトで live\-boot は aufs を利用します。このパラメータにより unionfs に切り替えることができます。 +デフォルトで live\-boot は aufs を利用します。このパラメータにより overlay に切り替えることができます。 .\" FIXME .SH "ファイル (古い情報)" diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5 index 9a2c482..f67042e 100644 --- a/manpages/ja/persistence.conf.ja.5 +++ b/manpages/ja/persistence.conf.ja.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2\-1 "Live システムプロジェクト" .SH 名前 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル @@ -52,10 +52,13 @@ live\-boot が「persistence」というラベル (GPT の名前やファイル 事実上、\fBlink\fP は既にソースディレクトリにあるファイルだけを保持し、\fIディレクトリ\fPにあるそれ以外のファイルは保持しません。保持するファイルをこのオプションの対象とするには手作業によりソースディレクトリに追加する必要があり、そうすることで\fIディレクトリ\fPに、既にそこにあるファイルに加えて現れるようになります。このオプションは特定のファイルだけを保持する必要があり、それがあるディレクトリ全体が必要ではない場合、例えばユーザのホームディレクトリにある設定ファイルの一部を保持する場合に有用です。 .IP \fBunion\fP 4 -結合ファイルシステムの rw -ブランチを保持用メディアに保存するため、変更点だけを持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク使用量を減らせる可能性があり、また読み取り専用メディアに追加したファイルを隠しません。1つ注意があり、結合後に実際のファイルシステムのルートではなくイメージの読み取り専用ファイルシステムから\fIディレクトリ\fPを使うため、(例えば -live\-config により) ブート後に作成されたファイルは結合後には見えなくなります。このオプションは live\-boot の \fBunion\fP -ブートパラメータにより指定された結合ファイルシステムを使いますが、\fBunion=unionmount\fP ではサポートしていません。 +Save the rw branch of a union on the persistence media, so only the changes +are stored persistently. This can potentially reduce disk usage compared to +bind\-mounts, and will not hide files added to the read\-only media. One +caveat is that the union will use \fIDIR\fP from the image's read\-only file +system, not the real file system root, so files created after boot (e.g. by +live\-config) will not appear in the union. This option will use the union +file system specified by live\-boot's \fBunion\fP boot parameter. .SH ディレクトリ .IP \fB/live/persistence\fP 4 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index e88e9f8..82e3509 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2014-12-10 10:35+0100\n" +"POT-Creation-Date: 2015-01-04 21:31+0100\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -25,7 +25,7 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2014-12-10" +msgid "2015-01-04" msgstr "" #. type: TH @@ -901,18 +901,18 @@ msgstr "" #. type: IP #: en/live-boot.7:135 #, no-wrap -msgid "B=aufs|unionfs" -msgstr "B=aufs|unionfs" +msgid "B=aufs|overlay" +msgstr "B=aufs|overlay" #. FIXME #. type: Plain text #: en/live-boot.7:138 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " -"unionfs." +"overlay." msgstr "" "Por defecto, live-boot usa aufs. Con este parámetro, se puede cambiar a " -"unionfs." +"overlay." #. FIXME #. type: SH diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 81afe76..845bcf9 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2014-12-10 10:35+0100\n" +"POT-Creation-Date: 2015-01-04 21:37+0100\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -23,7 +23,7 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2014-12-10" +msgid "2015-01-04" msgstr "" #. type: TH @@ -57,34 +57,34 @@ msgid "OPTIONS" msgstr "OPCIONES" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:154 en/persistence.conf.5:190 #, no-wrap msgid "SEE ALSO" msgstr "VER ADEMÁS" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:158 en/persistence.conf.5:194 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:160 en/persistence.conf.5:196 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:162 en/persistence.conf.5:198 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:163 en/persistence.conf.5:199 #, no-wrap msgid "HOMEPAGE" msgstr "PÁGINA WEB" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:202 +#: en/live-boot.7:165 en/persistence.conf.5:201 msgid "" "More information about live-boot and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -95,13 +95,13 @@ msgstr "" "manual en EIE." #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:203 +#: en/live-boot.7:166 en/persistence.conf.5:202 #, no-wrap msgid "BUGS" msgstr "ERRORES" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:204 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Bug Tracking System at EIE or by " @@ -114,13 +114,13 @@ msgstr "" "Systems a la dirección EIE." #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:206 +#: en/live-boot.7:169 en/persistence.conf.5:205 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:170 en/persistence.conf.5:207 +#: en/live-boot.7:170 en/persistence.conf.5:206 msgid "" "live-boot was written by Daniel Baumann EIE." msgstr "" @@ -357,7 +357,7 @@ msgid "B" msgstr "B" #. type: Plain text -#: en/persistence.conf.5:101 +#: en/persistence.conf.5:100 msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -365,8 +365,7 @@ msgid "" "caveat is that the union will use I from the image's read-only file " "system, not the real file system root, so files created after boot (e.g. by " "live-config) will not appear in the union. This option will use the union " -"file system specified by live-boot's B boot parameter, but is not " -"supported with B." +"file system specified by live-boot's B boot parameter." msgstr "" "Guardar la rama rw de una unión en un medio persistente, de modo que los " "cambios son guardados de forma persistente. Potencialmente esto puede " @@ -376,23 +375,22 @@ msgstr "" "de la imagen y no de la raíz del sistema de ficheros real, por eso los " "ficheros que se crean después del arranque (por ejemplo live-config) no " "aparecerán en la unión. Esta opción utilizará el sistema de ficheros unión " -"especificado por el parámetro de arranque B de live-boot pero no " -"tiene soporte si se utiliza B." +"especificado por el parámetro de arranque B de live-boot." #. type: SH -#: en/persistence.conf.5:102 +#: en/persistence.conf.5:101 #, no-wrap msgid "DIRECTORIES" msgstr "DIRECTORIOS" #. type: IP -#: en/persistence.conf.5:103 +#: en/persistence.conf.5:102 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/persistence.conf.5:109 +#: en/persistence.conf.5:108 msgid "" "All persistence volumes will be mounted here (in a directory corresponding " "to the device name). The B file can easily be edited " @@ -406,13 +404,13 @@ msgstr "" "personalizados usando la opción B)." #. type: SH -#: en/persistence.conf.5:110 +#: en/persistence.conf.5:109 #, no-wrap msgid "EXAMPLES" msgstr "EJEMPLOS" #. type: Plain text -#: en/persistence.conf.5:115 +#: en/persistence.conf.5:114 msgid "" "Let's say we have a persistence volume I with the a B " "file containing the following four lines (numbered for ease of reference):" @@ -422,56 +420,56 @@ msgstr "" "referencia):" #. type: TP -#: en/persistence.conf.5:115 en/persistence.conf.5:129 +#: en/persistence.conf.5:114 en/persistence.conf.5:128 #, no-wrap msgid "1." msgstr "1." #. type: Plain text -#: en/persistence.conf.5:118 +#: en/persistence.conf.5:117 msgid "/home/user1 link,source=config-files/user1" msgstr "/home/user1 link,source=config-files/user1" #. type: TP -#: en/persistence.conf.5:118 en/persistence.conf.5:133 +#: en/persistence.conf.5:117 en/persistence.conf.5:132 #, no-wrap msgid "2." msgstr "2." #. type: Plain text -#: en/persistence.conf.5:121 +#: en/persistence.conf.5:120 msgid "/home/user2 link,source=config-files/user2" msgstr "/home/user2 link,source=config-files/user2" #. type: TP -#: en/persistence.conf.5:121 en/persistence.conf.5:137 +#: en/persistence.conf.5:120 en/persistence.conf.5:136 #, no-wrap msgid "3." msgstr "3." #. type: Plain text -#: en/persistence.conf.5:124 +#: en/persistence.conf.5:123 msgid "/home" msgstr "/home" #. type: TP -#: en/persistence.conf.5:124 en/persistence.conf.5:140 +#: en/persistence.conf.5:123 en/persistence.conf.5:139 #, no-wrap msgid "4." msgstr "4." #. type: Plain text -#: en/persistence.conf.5:127 +#: en/persistence.conf.5:126 msgid "/usr union" msgstr "/usr union" #. type: Plain text -#: en/persistence.conf.5:129 +#: en/persistence.conf.5:128 msgid "The corresponding source directories are:" msgstr "Los directorios de origen correspondientes son:" #. type: Plain text -#: en/persistence.conf.5:133 +#: en/persistence.conf.5:132 msgid "" "I/config-files/user1 (but it would be I/home/user1 without the " "B option)" @@ -480,7 +478,7 @@ msgstr "" "B)" #. type: Plain text -#: en/persistence.conf.5:137 +#: en/persistence.conf.5:136 msgid "" "I/config-files/user2 (but it would be I/home/user2 without the " "B option)" @@ -489,17 +487,17 @@ msgstr "" "B)" #. type: Plain text -#: en/persistence.conf.5:140 +#: en/persistence.conf.5:139 msgid "I/home" msgstr "I/home" #. type: Plain text -#: en/persistence.conf.5:143 +#: en/persistence.conf.5:142 msgid "I/usr" msgstr "I/usr" #. type: Plain text -#: en/persistence.conf.5:146 +#: en/persistence.conf.5:145 msgid "" "It was necessary to set the B options for 1 and 2, since they " "otherwise would become nested with 3's source, which is invalid." @@ -508,7 +506,7 @@ msgstr "" "modo resultarían anidados con el origen de 3, lo cual no es válido." #. type: Plain text -#: en/persistence.conf.5:151 +#: en/persistence.conf.5:150 msgid "" "Line 3 will be taken care of before line 1 and 2 in order to prevent custom " "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I/home " @@ -522,80 +520,80 @@ msgstr "" "ficheros existen: " #. type: TP -#: en/persistence.conf.5:151 +#: en/persistence.conf.5:150 #, no-wrap msgid "a." msgstr "a." #. type: Plain text -#: en/persistence.conf.5:154 +#: en/persistence.conf.5:153 msgid "I/config-files/user1/.emacs" msgstr "I/config-files/user1/.emacs" #. type: TP -#: en/persistence.conf.5:154 +#: en/persistence.conf.5:153 #, no-wrap msgid "b." msgstr "b." #. type: Plain text -#: en/persistence.conf.5:157 +#: en/persistence.conf.5:156 msgid "I/config-files/user2/.bashrc" msgstr "I/config-files/user2/.bashrc" #. type: TP -#: en/persistence.conf.5:157 +#: en/persistence.conf.5:156 #, no-wrap msgid "c." msgstr "c." #. type: Plain text -#: en/persistence.conf.5:160 +#: en/persistence.conf.5:159 msgid "I/config-files/user2/.ssh/config" msgstr "I/config-files/user2/.ssh/config" #. type: Plain text -#: en/persistence.conf.5:162 +#: en/persistence.conf.5:161 msgid "Then the following links and directories will be created:" msgstr "Entonces se crearán los siguientes enlaces y directorios:" #. type: TP -#: en/persistence.conf.5:162 en/persistence.conf.5:165 -#: en/persistence.conf.5:171 +#: en/persistence.conf.5:161 en/persistence.conf.5:164 +#: en/persistence.conf.5:170 #, no-wrap msgid "Link:" msgstr "Enlace:" #. type: Plain text -#: en/persistence.conf.5:165 +#: en/persistence.conf.5:164 msgid "/home/user1/.emacs -E I/config-files/user1/.emacs (from a)" msgstr "/home/user1/.emacs -E I/config-files/user1/.emacs (de a)" #. type: Plain text -#: en/persistence.conf.5:168 +#: en/persistence.conf.5:167 msgid "/home/user2/.bashrc -E I/config-files/user2/.bashrc (from b)" msgstr "/home/user2/.bashrc -E I/config-files/user2/.bashrc (de b)" #. type: TP -#: en/persistence.conf.5:168 +#: en/persistence.conf.5:167 #, no-wrap msgid "Dir:" msgstr "Directorio:" #. type: Plain text -#: en/persistence.conf.5:171 +#: en/persistence.conf.5:170 msgid "/homea/user2/.ssh (from c)" msgstr "/homea/user2/.ssh (de c)" #. type: Plain text -#: en/persistence.conf.5:175 +#: en/persistence.conf.5:174 msgid "" "/home/user2/.ssh/config -E I/config-files/user2/.ssh/config (from c)" msgstr "" "/home/user2/.ssh/config -E I/config-files/user2/.ssh/config (de c)" #. type: Plain text -#: en/persistence.conf.5:181 +#: en/persistence.conf.5:180 msgid "" "One could argue, though, that lines 1 and 2 in the example B file above are unnecessary since line 3 already would make all of /" @@ -611,7 +609,7 @@ msgstr "" "incluidos en él." #. type: Plain text -#: en/persistence.conf.5:190 +#: en/persistence.conf.5:189 msgid "" "Line 4 can be mounted at any time since its I (and source directory) is " "completely disjoint from all the other custom mounts. When mounted, I/" @@ -631,6 +629,6 @@ msgstr "" "tendría que ser copiado en I/usr durante la preinstalación inicial." #. type: Plain text -#: en/persistence.conf.5:193 +#: en/persistence.conf.5:192 msgid "I(7)" msgstr "I(7)" diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po index 8906674..a278461 100644 --- a/manpages/po/ja/live-boot.7.po +++ b/manpages/po/ja/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2014-12-10 10:35+0100\n" +"POT-Creation-Date: 2015-01-04 21:31+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -23,7 +23,7 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2014-12-10" +msgid "2015-01-04" msgstr "" #. type: TH @@ -885,17 +885,17 @@ msgstr "" #. type: IP #: en/live-boot.7:135 #, no-wrap -msgid "B=aufs|unionfs" -msgstr "B=aufs|unionfs" +msgid "B=aufs|overlay" +msgstr "B=aufs|overlay" #. FIXME #. type: Plain text #: en/live-boot.7:138 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " -"unionfs." +"overlay." msgstr "" -"デフォルトで live-boot は aufs を利用します。このパラメータにより unionfs に" +"デフォルトで live-boot は aufs を利用します。このパラメータにより overlay に" "切り替えることができます。" #. FIXME diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po index 62c3c63..ccf7cbf 100644 --- a/manpages/po/ja/persistence.conf.5.po +++ b/manpages/po/ja/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2014-12-10 10:35+0100\n" +"POT-Creation-Date: 2015-01-04 21:37+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -23,7 +23,7 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2014-12-10" +msgid "2015-01-04" msgstr "" #. type: TH @@ -57,34 +57,34 @@ msgid "OPTIONS" msgstr "オプション" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:154 en/persistence.conf.5:190 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:158 en/persistence.conf.5:194 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:160 en/persistence.conf.5:196 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:162 en/persistence.conf.5:198 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:163 en/persistence.conf.5:199 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:202 +#: en/live-boot.7:165 en/persistence.conf.5:201 msgid "" "More information about live-boot and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -95,13 +95,13 @@ msgstr "" "systems.org/manual/>E のマニュアルにあります。" #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:203 +#: en/live-boot.7:166 en/persistence.conf.5:202 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:204 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Bug Tracking System at EIE or by " @@ -114,13 +114,13 @@ msgstr "" "報告できます。" #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:206 +#: en/live-boot.7:169 en/persistence.conf.5:205 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text -#: en/live-boot.7:170 en/persistence.conf.5:207 +#: en/live-boot.7:170 en/persistence.conf.5:206 msgid "" "live-boot was written by Daniel Baumann EIE." msgstr "" @@ -342,7 +342,17 @@ msgid "B" msgstr "B" #. type: Plain text -#: en/persistence.conf.5:101 +#: en/persistence.conf.5:100 +#, fuzzy +#| msgid "" +#| "Save the rw branch of a union on the persistence media, so only the " +#| "changes are stored persistently. This can potentially reduce disk usage " +#| "compared to bind-mounts, and will not hide files added to the read-only " +#| "media. One caveat is that the union will use I from the image's read-" +#| "only file system, not the real file system root, so files created after " +#| "boot (e.g. by live-config) will not appear in the union. This option will " +#| "use the union file system specified by live-boot's B boot " +#| "parameter, but is not supported with B." msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -350,8 +360,7 @@ msgid "" "caveat is that the union will use I from the image's read-only file " "system, not the real file system root, so files created after boot (e.g. by " "live-config) will not appear in the union. This option will use the union " -"file system specified by live-boot's B boot parameter, but is not " -"supported with B." +"file system specified by live-boot's B boot parameter." msgstr "" "結合ファイルシステムの rw ブランチを保持用メディアに保存するため、変更点だけ" "を持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク" @@ -363,19 +372,19 @@ msgstr "" "ルシステムを使いますが、B ではサポートしていません。" #. type: SH -#: en/persistence.conf.5:102 +#: en/persistence.conf.5:101 #, no-wrap msgid "DIRECTORIES" msgstr "ディレクトリ" #. type: IP -#: en/persistence.conf.5:103 +#: en/persistence.conf.5:102 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/persistence.conf.5:109 +#: en/persistence.conf.5:108 msgid "" "All persistence volumes will be mounted here (in a directory corresponding " "to the device name). The B file can easily be edited " @@ -388,13 +397,13 @@ msgstr "" "集できます。" #. type: SH -#: en/persistence.conf.5:110 +#: en/persistence.conf.5:109 #, no-wrap msgid "EXAMPLES" msgstr "例" #. type: Plain text -#: en/persistence.conf.5:115 +#: en/persistence.conf.5:114 msgid "" "Let's say we have a persistence volume I with the a B " "file containing the following four lines (numbered for ease of reference):" @@ -403,56 +412,56 @@ msgstr "" "を収録しているものとしましょう (番号は参照しやすいように付加しています):" #. type: TP -#: en/persistence.conf.5:115 en/persistence.conf.5:129 +#: en/persistence.conf.5:114 en/persistence.conf.5:128 #, no-wrap msgid "1." msgstr "1." #. type: Plain text -#: en/persistence.conf.5:118 +#: en/persistence.conf.5:117 msgid "/home/user1 link,source=config-files/user1" msgstr "/home/user1 link,source=config-files/user1" #. type: TP -#: en/persistence.conf.5:118 en/persistence.conf.5:133 +#: en/persistence.conf.5:117 en/persistence.conf.5:132 #, no-wrap msgid "2." msgstr "2." #. type: Plain text -#: en/persistence.conf.5:121 +#: en/persistence.conf.5:120 msgid "/home/user2 link,source=config-files/user2" msgstr "/home/user2 link,source=config-files/user2" #. type: TP -#: en/persistence.conf.5:121 en/persistence.conf.5:137 +#: en/persistence.conf.5:120 en/persistence.conf.5:136 #, no-wrap msgid "3." msgstr "3." #. type: Plain text -#: en/persistence.conf.5:124 +#: en/persistence.conf.5:123 msgid "/home" msgstr "/home" #. type: TP -#: en/persistence.conf.5:124 en/persistence.conf.5:140 +#: en/persistence.conf.5:123 en/persistence.conf.5:139 #, no-wrap msgid "4." msgstr "4." #. type: Plain text -#: en/persistence.conf.5:127 +#: en/persistence.conf.5:126 msgid "/usr union" msgstr "/usr union" #. type: Plain text -#: en/persistence.conf.5:129 +#: en/persistence.conf.5:128 msgid "The corresponding source directories are:" msgstr "それぞれに対応するディレクトリ:" #. type: Plain text -#: en/persistence.conf.5:133 +#: en/persistence.conf.5:132 msgid "" "I/config-files/user1 (but it would be I/home/user1 without the " "B option)" @@ -461,7 +470,7 @@ msgstr "" "I/home/user1)" #. type: Plain text -#: en/persistence.conf.5:137 +#: en/persistence.conf.5:136 msgid "" "I/config-files/user2 (but it would be I/home/user2 without the " "B option)" @@ -470,17 +479,17 @@ msgstr "" "I/home/user2)" #. type: Plain text -#: en/persistence.conf.5:140 +#: en/persistence.conf.5:139 msgid "I/home" msgstr "I/home" #. type: Plain text -#: en/persistence.conf.5:143 +#: en/persistence.conf.5:142 msgid "I/usr" msgstr "I/usr" #. type: Plain text -#: en/persistence.conf.5:146 +#: en/persistence.conf.5:145 msgid "" "It was necessary to set the B options for 1 and 2, since they " "otherwise would become nested with 3's source, which is invalid." @@ -489,7 +498,7 @@ msgstr "" "ソースと入り組んでしまい不正となるためです。" #. type: Plain text -#: en/persistence.conf.5:151 +#: en/persistence.conf.5:150 msgid "" "Line 3 will be taken care of before line 1 and 2 in order to prevent custom " "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I/home " @@ -502,74 +511,74 @@ msgstr "" "明するため、以下のファイルが存在するとしましょう:" #. type: TP -#: en/persistence.conf.5:151 +#: en/persistence.conf.5:150 #, no-wrap msgid "a." msgstr "a." #. type: Plain text -#: en/persistence.conf.5:154 +#: en/persistence.conf.5:153 msgid "I/config-files/user1/.emacs" msgstr "I/config-files/user1/.emacs" #. type: TP -#: en/persistence.conf.5:154 +#: en/persistence.conf.5:153 #, no-wrap msgid "b." msgstr "b." #. type: Plain text -#: en/persistence.conf.5:157 +#: en/persistence.conf.5:156 msgid "I/config-files/user2/.bashrc" msgstr "I/config-files/user2/.bashrc" #. type: TP -#: en/persistence.conf.5:157 +#: en/persistence.conf.5:156 #, no-wrap msgid "c." msgstr "c." #. type: Plain text -#: en/persistence.conf.5:160 +#: en/persistence.conf.5:159 msgid "I/config-files/user2/.ssh/config" msgstr "I/config-files/user2/.ssh/config" #. type: Plain text -#: en/persistence.conf.5:162 +#: en/persistence.conf.5:161 msgid "Then the following links and directories will be created:" msgstr "それにより作成されるリンクやディレクトリ:" #. type: TP -#: en/persistence.conf.5:162 en/persistence.conf.5:165 -#: en/persistence.conf.5:171 +#: en/persistence.conf.5:161 en/persistence.conf.5:164 +#: en/persistence.conf.5:170 #, no-wrap msgid "Link:" msgstr "リンク:" #. type: Plain text -#: en/persistence.conf.5:165 +#: en/persistence.conf.5:164 msgid "/home/user1/.emacs -E I/config-files/user1/.emacs (from a)" msgstr "/home/user1/.emacs -E I/config-files/user1/.emacs (a の場合)" #. type: Plain text -#: en/persistence.conf.5:168 +#: en/persistence.conf.5:167 msgid "/home/user2/.bashrc -E I/config-files/user2/.bashrc (from b)" msgstr "" "/home/user2/.bashrc -E I/config-files/user2/.bashrc (b の場合)" #. type: TP -#: en/persistence.conf.5:168 +#: en/persistence.conf.5:167 #, no-wrap msgid "Dir:" msgstr "ディレクトリ:" #. type: Plain text -#: en/persistence.conf.5:171 +#: en/persistence.conf.5:170 msgid "/homea/user2/.ssh (from c)" msgstr "/homea/user2/.ssh (c の場合)" #. type: Plain text -#: en/persistence.conf.5:175 +#: en/persistence.conf.5:174 msgid "" "/home/user2/.ssh/config -E I/config-files/user2/.ssh/config (from c)" msgstr "" @@ -577,7 +586,7 @@ msgstr "" "合)" #. type: Plain text -#: en/persistence.conf.5:181 +#: en/persistence.conf.5:180 msgid "" "One could argue, though, that lines 1 and 2 in the example B file above are unnecessary since line 3 already would make all of /" @@ -592,7 +601,7 @@ msgstr "" "ます。" #. type: Plain text -#: en/persistence.conf.5:190 +#: en/persistence.conf.5:189 msgid "" "Line 4 can be mounted at any time since its I (and source directory) is " "completely disjoint from all the other custom mounts. When mounted, I/" @@ -611,6 +620,6 @@ msgstr "" "あるためです。" #. type: Plain text -#: en/persistence.conf.5:193 +#: en/persistence.conf.5:192 msgid "I(7)" msgstr "I(7)" diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 7e591e9..51b853b 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 4.0.2-1\n" -"POT-Creation-Date: 2014-12-10 10:35+0100\n" +"POT-Creation-Date: 2015-01-04 21:31+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2014-12-10" +msgid "2015-01-04" msgstr "" #. type: TH @@ -735,7 +735,7 @@ msgstr "" #. type: IP #: en/live-boot.7:135 #, no-wrap -msgid "B=aufs|unionfs" +msgid "B=aufs|overlay" msgstr "" #. FIXME @@ -743,7 +743,7 @@ msgstr "" #: en/live-boot.7:138 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " -"unionfs." +"overlay." msgstr "" #. FIXME diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 01cbc8e..302c5f3 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 4.0.2-1\n" -"POT-Creation-Date: 2014-12-10 10:35+0100\n" +"POT-Creation-Date: 2015-01-04 21:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2014-12-10" +msgid "2015-01-04" msgstr "" #. type: TH @@ -59,34 +59,34 @@ msgid "OPTIONS" msgstr "" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:154 en/persistence.conf.5:190 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:158 en/persistence.conf.5:194 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:160 en/persistence.conf.5:196 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:162 en/persistence.conf.5:198 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:163 en/persistence.conf.5:199 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:202 +#: en/live-boot.7:165 en/persistence.conf.5:201 msgid "" "More information about live-boot and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -94,13 +94,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:203 +#: en/live-boot.7:166 en/persistence.conf.5:202 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:204 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Bug Tracking System at EIE or by " @@ -109,13 +109,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:206 +#: en/live-boot.7:169 en/persistence.conf.5:205 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/persistence.conf.5:207 +#: en/live-boot.7:170 en/persistence.conf.5:206 msgid "" "live-boot was written by Daniel Baumann EIE." msgstr "" @@ -276,7 +276,7 @@ msgid "B" msgstr "" #. type: Plain text -#: en/persistence.conf.5:101 +#: en/persistence.conf.5:100 msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -284,24 +284,23 @@ msgid "" "caveat is that the union will use I from the image's read-only file " "system, not the real file system root, so files created after boot (e.g. by " "live-config) will not appear in the union. This option will use the union " -"file system specified by live-boot's B boot parameter, but is not " -"supported with B." +"file system specified by live-boot's B boot parameter." msgstr "" #. type: SH -#: en/persistence.conf.5:102 +#: en/persistence.conf.5:101 #, no-wrap msgid "DIRECTORIES" msgstr "" #. type: IP -#: en/persistence.conf.5:103 +#: en/persistence.conf.5:102 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/persistence.conf.5:109 +#: en/persistence.conf.5:108 msgid "" "All persistence volumes will be mounted here (in a directory corresponding " "to the device name). The B file can easily be edited " @@ -310,100 +309,100 @@ msgid "" msgstr "" #. type: SH -#: en/persistence.conf.5:110 +#: en/persistence.conf.5:109 #, no-wrap msgid "EXAMPLES" msgstr "" #. type: Plain text -#: en/persistence.conf.5:115 +#: en/persistence.conf.5:114 msgid "" "Let's say we have a persistence volume I with the a B " "file containing the following four lines (numbered for ease of reference):" msgstr "" #. type: TP -#: en/persistence.conf.5:115 en/persistence.conf.5:129 +#: en/persistence.conf.5:114 en/persistence.conf.5:128 #, no-wrap msgid "1." msgstr "" #. type: Plain text -#: en/persistence.conf.5:118 +#: en/persistence.conf.5:117 msgid "/home/user1 link,source=config-files/user1" msgstr "" #. type: TP -#: en/persistence.conf.5:118 en/persistence.conf.5:133 +#: en/persistence.conf.5:117 en/persistence.conf.5:132 #, no-wrap msgid "2." msgstr "" #. type: Plain text -#: en/persistence.conf.5:121 +#: en/persistence.conf.5:120 msgid "/home/user2 link,source=config-files/user2" msgstr "" #. type: TP -#: en/persistence.conf.5:121 en/persistence.conf.5:137 +#: en/persistence.conf.5:120 en/persistence.conf.5:136 #, no-wrap msgid "3." msgstr "" #. type: Plain text -#: en/persistence.conf.5:124 +#: en/persistence.conf.5:123 msgid "/home" msgstr "" #. type: TP -#: en/persistence.conf.5:124 en/persistence.conf.5:140 +#: en/persistence.conf.5:123 en/persistence.conf.5:139 #, no-wrap msgid "4." msgstr "" #. type: Plain text -#: en/persistence.conf.5:127 +#: en/persistence.conf.5:126 msgid "/usr union" msgstr "" #. type: Plain text -#: en/persistence.conf.5:129 +#: en/persistence.conf.5:128 msgid "The corresponding source directories are:" msgstr "" #. type: Plain text -#: en/persistence.conf.5:133 +#: en/persistence.conf.5:132 msgid "" "I/config-files/user1 (but it would be I/home/user1 without the " "B option)" msgstr "" #. type: Plain text -#: en/persistence.conf.5:137 +#: en/persistence.conf.5:136 msgid "" "I/config-files/user2 (but it would be I/home/user2 without the " "B option)" msgstr "" #. type: Plain text -#: en/persistence.conf.5:140 +#: en/persistence.conf.5:139 msgid "I/home" msgstr "" #. type: Plain text -#: en/persistence.conf.5:143 +#: en/persistence.conf.5:142 msgid "I/usr" msgstr "" #. type: Plain text -#: en/persistence.conf.5:146 +#: en/persistence.conf.5:145 msgid "" "It was necessary to set the B options for 1 and 2, since they " "otherwise would become nested with 3's source, which is invalid." msgstr "" #. type: Plain text -#: en/persistence.conf.5:151 +#: en/persistence.conf.5:150 msgid "" "Line 3 will be taken care of before line 1 and 2 in order to prevent custom " "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I/home " @@ -412,79 +411,79 @@ msgid "" msgstr "" #. type: TP -#: en/persistence.conf.5:151 +#: en/persistence.conf.5:150 #, no-wrap msgid "a." msgstr "" #. type: Plain text -#: en/persistence.conf.5:154 +#: en/persistence.conf.5:153 msgid "I/config-files/user1/.emacs" msgstr "" #. type: TP -#: en/persistence.conf.5:154 +#: en/persistence.conf.5:153 #, no-wrap msgid "b." msgstr "" #. type: Plain text -#: en/persistence.conf.5:157 +#: en/persistence.conf.5:156 msgid "I/config-files/user2/.bashrc" msgstr "" #. type: TP -#: en/persistence.conf.5:157 +#: en/persistence.conf.5:156 #, no-wrap msgid "c." msgstr "" #. type: Plain text -#: en/persistence.conf.5:160 +#: en/persistence.conf.5:159 msgid "I/config-files/user2/.ssh/config" msgstr "" #. type: Plain text -#: en/persistence.conf.5:162 +#: en/persistence.conf.5:161 msgid "Then the following links and directories will be created:" msgstr "" #. type: TP -#: en/persistence.conf.5:162 en/persistence.conf.5:165 -#: en/persistence.conf.5:171 +#: en/persistence.conf.5:161 en/persistence.conf.5:164 +#: en/persistence.conf.5:170 #, no-wrap msgid "Link:" msgstr "" #. type: Plain text -#: en/persistence.conf.5:165 +#: en/persistence.conf.5:164 msgid "/home/user1/.emacs -E I/config-files/user1/.emacs (from a)" msgstr "" #. type: Plain text -#: en/persistence.conf.5:168 +#: en/persistence.conf.5:167 msgid "/home/user2/.bashrc -E I/config-files/user2/.bashrc (from b)" msgstr "" #. type: TP -#: en/persistence.conf.5:168 +#: en/persistence.conf.5:167 #, no-wrap msgid "Dir:" msgstr "" #. type: Plain text -#: en/persistence.conf.5:171 +#: en/persistence.conf.5:170 msgid "/homea/user2/.ssh (from c)" msgstr "" #. type: Plain text -#: en/persistence.conf.5:175 +#: en/persistence.conf.5:174 msgid "" "/home/user2/.ssh/config -E I/config-files/user2/.ssh/config (from c)" msgstr "" #. type: Plain text -#: en/persistence.conf.5:181 +#: en/persistence.conf.5:180 msgid "" "One could argue, though, that lines 1 and 2 in the example B file above are unnecessary since line 3 already would make all of /" @@ -494,7 +493,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/persistence.conf.5:190 +#: en/persistence.conf.5:189 msgid "" "Line 4 can be mounted at any time since its I (and source directory) is " "completely disjoint from all the other custom mounts. When mounted, I/" @@ -506,6 +505,6 @@ msgid "" msgstr "" #. type: Plain text -#: en/persistence.conf.5:193 +#: en/persistence.conf.5:192 msgid "I(7)" msgstr "" From f2dcec3f21086a557db86ae928295474be79d35b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:36:37 +0100 Subject: [PATCH 07/31] Simplifying code a bit after removal of no longer supported overlay alternatives. --- components/9990-misc-helpers.sh | 28 +++++++++++----------------- components/9990-overlay.sh | 14 +++++--------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index fcd2b07..87c4930 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1292,16 +1292,22 @@ do_union () rw_opt="rw" ro_opt="rr+wh" noxino_opt="noxino" + + unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}" + if [ -n "${unionro}" ] + then + for rofs in ${unionro} + do + unionmountopts="${unionmountopts}:${rofs}=${ro_opt}" + done + fi + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; - *) + overlay) rw_opt="rw" ro_opt="ro" - ;; - esac - case "${UNIONTYPE}" in - overlay) # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? if echo ${unionro} | grep -q " " @@ -1314,18 +1320,6 @@ do_union () unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; - - *) - unionmountopts="-o noatime,${noxino_opt},dirs=${unionrw}=${rw_opt}" - if [ -n "${unionro}" ] - then - for rofs in ${unionro} - do - unionmountopts="${unionmountopts}:${rofs}=${ro_opt}" - done - fi - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" - ;; esac } diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 316a21d..54b75e5 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -8,16 +8,12 @@ setup_unionfs () rootmnt="${2}" addimage_directory="${3}" - case ${UNIONTYPE} in - aufs|overlay) - if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" - then - panic "${UNIONTYPE} not available." - fi + if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" + then + panic "${UNIONTYPE} not available." + fi - modprobe -q -b ${UNIONTYPE} - ;; - esac + modprobe -q -b ${UNIONTYPE} # run-init can't deal with images in a subdir, but we're going to # move all of these away before it runs anyway. No, we're not, From 6fae187035cc9486574834f78e79dd495055e809 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:49:32 +0100 Subject: [PATCH 08/31] Updating year in copyright notices to 2015. --- debian/copyright | 2 +- manpages/bin/update-version.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/copyright b/debian/copyright index eabae2a..90f0fcc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Live Systems Project Source: http://live-systems.org/archive/packages/live-boot/ Files: * -Copyright: 2006-2014 Daniel Baumann +Copyright: 2006-2015 Daniel Baumann 2005-2008 Canonical Ltd. 2008 Chris Lamb 2006-2007 Marco Amadori diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh index dc58a25..bfa6fbb 100755 --- a/manpages/bin/update-version.sh +++ b/manpages/bin/update-version.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-boot(7) - System Boot Components -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -35,8 +35,8 @@ do then for _FILE in po/${_LANGUAGE}/*.po do - sed -i -e "s|^msgstr .*.2014-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ - -e "s|^msgstr .*.2014\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ + sed -i -e "s|^msgstr .*.2015-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ + -e "s|^msgstr .*.2015\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ "${_FILE}" done fi @@ -47,8 +47,8 @@ if ls po/pt_BR/*.po > /dev/null 2>&1 then for _FILE in po/pt_BR/*.po do - sed -i -e "s|^msgstr .*.2014-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ - -e "s|^msgstr .*-2014\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ + sed -i -e "s|^msgstr .*.2015-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ + -e "s|^msgstr .*-2015\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ "${_FILE}" done fi From 3a68424fa4d5372cc0fc60d07f58867d41ddcafc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 4 Jan 2015 21:50:54 +0100 Subject: [PATCH 09/31] Releasing debian version 5.0~a1-1. Signed-off-by: Daniel Baumann --- VERSION | 2 +- debian/changelog | 20 ++++++++++++++++++++ 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/ja/live-boot.ja.7 | 2 +- manpages/ja/persistence.conf.ja.5 | 2 +- manpages/po/es/live-boot.7.po | 24 ++++++++++++------------ manpages/po/es/persistence.conf.5.po | 4 ++-- manpages/po/ja/live-boot.7.po | 24 ++++++++++++------------ manpages/po/ja/persistence.conf.5.po | 4 ++-- manpages/pot/live-boot.7.pot | 26 +++++++++++++------------- manpages/pot/persistence.conf.5.pot | 6 +++--- 14 files changed, 71 insertions(+), 51 deletions(-) diff --git a/VERSION b/VERSION index 2e18714..7b40dc0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.2-1 +5.0~a1-1 diff --git a/debian/changelog b/debian/changelog index cd5d7b4..1c00936 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +live-boot (5.0~a1-1) experimental; urgency=low + + [ Tails developers ] + * Fixing name of overlayfs kernel module for inclusion in the initramfs + (Closes: #773868). + + [ Daniel Baumann ] + * Using 'overlay' instead of 'overlayfs' everywhere, without backwards + compatibility (Closes: #773881). + * Dropping unionfs-fuse support: + * Dropping unionfs support, long superseeded with aufs. + * Dropping unionmount support, superseeded with overlay in mainline + kernel. + * Updating manpages for union= boot parameter. + * Simplifying code a bit after removal of no longer supported overlay + alternatives. + * Updating year in copyright notices to 2015. + + -- Daniel Baumann Sun, 04 Jan 2015 21:50:28 +0100 + live-boot (4.0.2-1) unstable; urgency=low [ Daniel Baumann ] diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 16d11ab..60b462c 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2-1 "Live Systems Project" +.TH LIVE\-BOOT 7 2015\-01\-04 5.0~a1-1 "Live Systems Project" .SH NAME \fBlive\-boot\fR \- System Boot Components diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index c0ff914..015e40d 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2-1 "Live Systems Project" +.TH LIVE\-BOOT conf 2015\-01\-04 5.0~a1-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 5f0cec4..fee6010 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 2015\-01\-04 4.0.2\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT 7 2015\-01\-04 5.0~a1\-1 "Proyecto Live Systems" .SH NOMBRE \fBlive\-boot\fP \- Componentes de Arranque del Sistema diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 9176791..31e7f26 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 2015\-01\-04 4.0.2\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT conf 2015\-01\-04 5.0~a1\-1 "Proyecto Live Systems" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7 index dec688d..3c120ca 100644 --- a/manpages/ja/live-boot.ja.7 +++ b/manpages/ja/live-boot.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT 7 2015\-01\-04 5.0~a1\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-boot\fP \- システム起動構成要素 diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5 index f67042e..58080c1 100644 --- a/manpages/ja/persistence.conf.ja.5 +++ b/manpages/ja/persistence.conf.ja.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT conf 2015\-01\-04 5.0~a1\-1 "Live システムプロジェクト" .SH 名前 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 82e3509..dca818f 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:31+0100\n" +"POT-Creation-Date: 2015-01-04 21:50+0100\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -31,7 +31,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0.2-1" +msgid "5.0~a1-1" msgstr "" #. type: TH @@ -1002,7 +1002,7 @@ msgid "B" msgstr "B" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:154 en/persistence.conf.5:190 #, no-wrap msgid "SEE ALSO" msgstr "VER ADEMÁS" @@ -1013,28 +1013,28 @@ msgid "I(5)" msgstr "I(5)" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:158 en/persistence.conf.5:194 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:160 en/persistence.conf.5:196 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:162 en/persistence.conf.5:198 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:163 en/persistence.conf.5:199 #, no-wrap msgid "HOMEPAGE" msgstr "PÁGINA WEB" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:202 +#: en/live-boot.7:165 en/persistence.conf.5:201 msgid "" "More information about live-boot and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -1045,13 +1045,13 @@ msgstr "" "manual en EIE." #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:203 +#: en/live-boot.7:166 en/persistence.conf.5:202 #, no-wrap msgid "BUGS" msgstr "ERRORES" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:204 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Bug Tracking System at EIE or by " @@ -1064,13 +1064,13 @@ msgstr "" "Systems a la dirección EIE." #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:206 +#: en/live-boot.7:169 en/persistence.conf.5:205 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:170 en/persistence.conf.5:207 +#: en/live-boot.7:170 en/persistence.conf.5:206 msgid "" "live-boot was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 845bcf9..b44e4c4 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:37+0100\n" +"POT-Creation-Date: 2015-01-04 21:50+0100\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0.2-1" +msgid "5.0~a1-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po index a278461..10a5250 100644 --- a/manpages/po/ja/live-boot.7.po +++ b/manpages/po/ja/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:31+0100\n" +"POT-Creation-Date: 2015-01-04 21:50+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0.2-1" +msgid "5.0~a1-1" msgstr "" #. type: TH @@ -982,7 +982,7 @@ msgid "B" msgstr "B" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:154 en/persistence.conf.5:190 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" @@ -993,28 +993,28 @@ msgid "I(5)" msgstr "I(5)" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:158 en/persistence.conf.5:194 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:160 en/persistence.conf.5:196 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:162 en/persistence.conf.5:198 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:163 en/persistence.conf.5:199 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:202 +#: en/live-boot.7:165 en/persistence.conf.5:201 msgid "" "More information about live-boot and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -1025,13 +1025,13 @@ msgstr "" "systems.org/manual/>E のマニュアルにあります。" #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:203 +#: en/live-boot.7:166 en/persistence.conf.5:202 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:204 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Bug Tracking System at EIE or by " @@ -1044,13 +1044,13 @@ msgstr "" "報告できます。" #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:206 +#: en/live-boot.7:169 en/persistence.conf.5:205 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text -#: en/live-boot.7:170 en/persistence.conf.5:207 +#: en/live-boot.7:170 en/persistence.conf.5:206 msgid "" "live-boot was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po index ccf7cbf..1e62684 100644 --- a/manpages/po/ja/persistence.conf.5.po +++ b/manpages/po/ja/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:37+0100\n" +"POT-Creation-Date: 2015-01-04 21:50+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0.2-1" +msgid "5.0~a1-1" msgstr "" #. type: TH diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 51b853b..53ecdf9 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0.2-1\n" -"POT-Creation-Date: 2015-01-04 21:31+0100\n" +"Project-Id-Version: live-boot 5.0~a1-1\n" +"POT-Creation-Date: 2015-01-04 21:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0.2-1" +msgid "5.0~a1-1" msgstr "" #. type: TH @@ -823,7 +823,7 @@ msgid "B" msgstr "" #. type: SH -#: en/live-boot.7:154 en/persistence.conf.5:191 +#: en/live-boot.7:154 en/persistence.conf.5:190 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -834,28 +834,28 @@ msgid "I(5)" msgstr "" #. type: Plain text -#: en/live-boot.7:158 en/persistence.conf.5:195 +#: en/live-boot.7:158 en/persistence.conf.5:194 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:160 en/persistence.conf.5:197 +#: en/live-boot.7:160 en/persistence.conf.5:196 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:162 en/persistence.conf.5:199 +#: en/live-boot.7:162 en/persistence.conf.5:198 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:163 en/persistence.conf.5:200 +#: en/live-boot.7:163 en/persistence.conf.5:199 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:165 en/persistence.conf.5:202 +#: en/live-boot.7:165 en/persistence.conf.5:201 msgid "" "More information about live-boot and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -863,13 +863,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:166 en/persistence.conf.5:203 +#: en/live-boot.7:166 en/persistence.conf.5:202 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:168 en/persistence.conf.5:205 +#: en/live-boot.7:168 en/persistence.conf.5:204 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Bug Tracking System at EIE or by " @@ -878,13 +878,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:169 en/persistence.conf.5:206 +#: en/live-boot.7:169 en/persistence.conf.5:205 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:170 en/persistence.conf.5:207 +#: en/live-boot.7:170 en/persistence.conf.5:206 msgid "" "live-boot was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 302c5f3..4e74bca 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0.2-1\n" -"POT-Creation-Date: 2015-01-04 21:37+0100\n" +"Project-Id-Version: live-boot 5.0~a1-1\n" +"POT-Creation-Date: 2015-01-04 21:50+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0.2-1" +msgid "5.0~a1-1" msgstr "" #. type: TH From 73d837abfd95add4e0792ef27df8c7eea8a7388f Mon Sep 17 00:00:00 2001 From: Tom Jampen Date: Mon, 15 Dec 2014 15:17:04 +0100 Subject: [PATCH 10/31] Adding command line parameter to remove persistence. --- components/2010-remove-persistence | 31 ++++++++++++++++++++++++++++++ components/9990-overlay.sh | 3 +++ 2 files changed, 34 insertions(+) create mode 100755 components/2010-remove-persistence diff --git a/components/2010-remove-persistence b/components/2010-remove-persistence new file mode 100755 index 0000000..5dcf0c0 --- /dev/null +++ b/components/2010-remove-persistence @@ -0,0 +1,31 @@ +#!/bin/sh + +#set -e + +Remove_persistence () +{ + for _PARAMETER in ${LIVE_BOOT_CMDLINE} + do + case "${_PARAMETER}" in + live-boot.persistence-remove=*|persistence-remove=*) + LIVE_PERSISTENCE_REMOVE="${_PARAMETER#*persistence-remove=}" + ;; + + live-boot.persistence-remove|persistence-remove) + LIVE_PERSISTENCE_REMOVE="true" + ;; + esac + done + + case "${LIVE_PERSISTENCE_REMOVE}" in + true) + ;; + + *) + return 0 + ;; + esac + + # Remove persistence + cd /live/overlay && find . -not -name 'persistence.conf' | xargs rm -rf +} diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 54b75e5..92d0355 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -299,6 +299,9 @@ setup_unionfs () fi || panic "mount ${UNIONTYPE} on ${unionmountpoint} failed with option ${unionmountopts}" done + # Remove persistence depending on boot parameter + Remove_persistence + # Correct the permissions of /: chmod 0755 "${rootmnt}" From db25153a257eda7e396f89b522b2f68ae3f21ddd Mon Sep 17 00:00:00 2001 From: Gaudenz Steinlin Date: Thu, 2 Apr 2015 17:27:08 +0200 Subject: [PATCH 11/31] Modprobe filesystem modules before checking support. This bug was accidentially introduced in commit ec9bd07c which removed unionfs-fuse support. --- components/9990-overlay.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 92d0355..9282276 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -8,13 +8,13 @@ setup_unionfs () rootmnt="${2}" addimage_directory="${3}" + modprobe -q -b ${UNIONTYPE} + if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" then panic "${UNIONTYPE} not available." fi - modprobe -q -b ${UNIONTYPE} - # run-init can't deal with images in a subdir, but we're going to # move all of these away before it runs anyway. No, we're not, # put them in / since move-mounting them into / breaks mono and From 71f51d671acb15907cff63595ddc8e04b4664815 Mon Sep 17 00:00:00 2001 From: victory Date: Thu, 9 Apr 2015 05:27:35 +0900 Subject: [PATCH 12/31] Unfuzzy Japanese translation. --- manpages/ja/persistence.conf.ja.5 | 11 ++++------- manpages/po/ja/persistence.conf.5.po | 20 +++++--------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5 index 58080c1..a66b10b 100644 --- a/manpages/ja/persistence.conf.ja.5 +++ b/manpages/ja/persistence.conf.ja.5 @@ -52,13 +52,10 @@ live\-boot が「persistence」というラベル (GPT の名前やファイル 事実上、\fBlink\fP は既にソースディレクトリにあるファイルだけを保持し、\fIディレクトリ\fPにあるそれ以外のファイルは保持しません。保持するファイルをこのオプションの対象とするには手作業によりソースディレクトリに追加する必要があり、そうすることで\fIディレクトリ\fPに、既にそこにあるファイルに加えて現れるようになります。このオプションは特定のファイルだけを保持する必要があり、それがあるディレクトリ全体が必要ではない場合、例えばユーザのホームディレクトリにある設定ファイルの一部を保持する場合に有用です。 .IP \fBunion\fP 4 -Save the rw branch of a union on the persistence media, so only the changes -are stored persistently. This can potentially reduce disk usage compared to -bind\-mounts, and will not hide files added to the read\-only media. One -caveat is that the union will use \fIDIR\fP from the image's read\-only file -system, not the real file system root, so files created after boot (e.g. by -live\-config) will not appear in the union. This option will use the union -file system specified by live\-boot's \fBunion\fP boot parameter. +結合ファイルシステムの rw +ブランチを保持用メディアに保存するため、変更点だけを持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク使用量を減らせる可能性があり、また読み取り専用メディアに追加したファイルを隠しません。1つ注意があり、結合後に実際のファイルシステムのルートではなくイメージの読み取り専用ファイルシステムから\fIディレクトリ\fPを使うため、(例えば +live\-config により) ブート後に作成されたファイルは結合後には見えなくなります。このオプションは live\-boot の \fBunion\fP +ブートパラメータにより指定された結合ファイルシステムを使います。 .SH ディレクトリ .IP \fB/live/persistence\fP 4 diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po index 1e62684..bbb74eb 100644 --- a/manpages/po/ja/persistence.conf.5.po +++ b/manpages/po/ja/persistence.conf.5.po @@ -1,12 +1,12 @@ # Japanese translations for live-boot package -# Copyright (C) 2013-2014 victory +# Copyright (C) 2013-2015 victory # This file is distributed under the same license as the live-boot package. # msgid "" msgstr "" "Project-Id-Version: live-boot\n" "POT-Creation-Date: 2015-01-04 21:50+0100\n" -"PO-Revision-Date: 2014-08-28 02:52+0900\n" +"PO-Revision-Date: 2015-01-05 05:50+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" "Language: ja\n" @@ -24,13 +24,13 @@ msgstr "LIVE-BOOT" #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "2015-01-04" -msgstr "" +msgstr "2015-01-04" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap msgid "5.0~a1-1" -msgstr "" +msgstr "5.0~a1-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -343,16 +343,6 @@ msgstr "B" #. type: Plain text #: en/persistence.conf.5:100 -#, fuzzy -#| msgid "" -#| "Save the rw branch of a union on the persistence media, so only the " -#| "changes are stored persistently. This can potentially reduce disk usage " -#| "compared to bind-mounts, and will not hide files added to the read-only " -#| "media. One caveat is that the union will use I from the image's read-" -#| "only file system, not the real file system root, so files created after " -#| "boot (e.g. by live-config) will not appear in the union. This option will " -#| "use the union file system specified by live-boot's B boot " -#| "parameter, but is not supported with B." msgid "" "Save the rw branch of a union on the persistence media, so only the changes " "are stored persistently. This can potentially reduce disk usage compared to " @@ -369,7 +359,7 @@ msgstr "" "ジの読み取り専用ファイルシステムからI<ディレクトリ>を使うため、(例えば live-" "config により) ブート後に作成されたファイルは結合後には見えなくなります。この" "オプションは live-boot の B ブートパラメータにより指定された結合ファイ" -"ルシステムを使いますが、B ではサポートしていません。" +"ルシステムを使います。" #. type: SH #: en/persistence.conf.5:101 From 8bb7633a1b25fd465d015119d6f15a159f68b8dd Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 26 Apr 2015 20:12:07 +0200 Subject: [PATCH 13/31] Releasing debian version 5.0~a2-1. Signed-off-by: Daniel Baumann --- VERSION | 2 +- debian/changelog | 13 +++++++++++++ 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/ja/live-boot.ja.7 | 2 +- manpages/ja/persistence.conf.ja.5 | 2 +- manpages/po/es/live-boot.7.po | 6 +++--- manpages/po/es/persistence.conf.5.po | 6 +++--- manpages/po/ja/live-boot.7.po | 16 +++++++++------- manpages/po/ja/persistence.conf.5.po | 12 +++++++----- manpages/pot/live-boot.7.pot | 8 ++++---- manpages/pot/persistence.conf.5.pot | 8 ++++---- 14 files changed, 50 insertions(+), 33 deletions(-) diff --git a/VERSION b/VERSION index 7b40dc0..4b5dad6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0~a1-1 +5.0~a2-1 diff --git a/debian/changelog b/debian/changelog index 1c00936..e464897 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +live-boot (5.0~a2-1) unstable; urgency=low + + [ Tom Jampen ] + * Adding command line parameter to remove persistence. + + [ Gaudenz Steinlin ] + * Modprobe filesystem modules before checking support. + + [ victory ] + * Unfuzzy Japanese translation. + + -- Daniel Baumann Sun, 26 Apr 2015 20:11:46 +0200 + live-boot (5.0~a1-1) experimental; urgency=low [ Tails developers ] diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 60b462c..d391c19 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2015\-01\-04 5.0~a1-1 "Live Systems Project" +.TH LIVE\-BOOT 7 2015\-04\-26 5.0~a2-1 "Live Systems Project" .SH NAME \fBlive\-boot\fR \- System Boot Components diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index 015e40d..d606fe3 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2015\-01\-04 5.0~a1-1 "Live Systems Project" +.TH LIVE\-BOOT conf 2015\-04\-26 5.0~a2-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 fee6010..e4985df 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 2015\-01\-04 5.0~a1\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT 7 2015\-04\-26 5.0~a2\-1 "Proyecto Live Systems" .SH NOMBRE \fBlive\-boot\fP \- Componentes de Arranque del Sistema diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 31e7f26..6f8bbf6 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 2015\-01\-04 5.0~a1\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT conf 2015\-04\-26 5.0~a2\-1 "Proyecto Live Systems" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7 index 3c120ca..7d0e38f 100644 --- a/manpages/ja/live-boot.ja.7 +++ b/manpages/ja/live-boot.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 2015\-01\-04 5.0~a1\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT 7 2015\-04\-26 5.0~a2\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-boot\fP \- システム起動構成要素 diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5 index a66b10b..91cc46e 100644 --- a/manpages/ja/persistence.conf.ja.5 +++ b/manpages/ja/persistence.conf.ja.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 2015\-01\-04 5.0~a1\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT conf 2015\-04\-26 5.0~a2\-1 "Live システムプロジェクト" .SH 名前 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index dca818f..7e03daa 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:50+0100\n" +"POT-Creation-Date: 2015-04-26 20:12+0200\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -25,13 +25,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2015-01-04" +msgid "2015-04-26" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a1-1" +msgid "5.0~a2-1" msgstr "" #. type: TH diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index b44e4c4..527a028 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:50+0100\n" +"POT-Creation-Date: 2015-04-26 20:12+0200\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -23,13 +23,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2015-01-04" +msgid "2015-04-26" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a1-1" +msgid "5.0~a2-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po index 10a5250..33a7075 100644 --- a/manpages/po/ja/live-boot.7.po +++ b/manpages/po/ja/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:50+0100\n" +"POT-Creation-Date: 2015-04-26 20:12+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -22,15 +22,17 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -#, no-wrap -msgid "2015-01-04" -msgstr "" +#, fuzzy, no-wrap +#| msgid "2015-01-04" +msgid "2015-04-26" +msgstr "2015-01-04" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -#, no-wrap -msgid "5.0~a1-1" -msgstr "" +#, fuzzy, no-wrap +#| msgid "5.0~a1-1" +msgid "5.0~a2-1" +msgstr "5.0~a1-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po index bbb74eb..86a685e 100644 --- a/manpages/po/ja/persistence.conf.5.po +++ b/manpages/po/ja/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-01-04 21:50+0100\n" +"POT-Creation-Date: 2015-04-26 20:12+0200\n" "PO-Revision-Date: 2015-01-05 05:50+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -22,14 +22,16 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -#, no-wrap -msgid "2015-01-04" +#, fuzzy, no-wrap +#| msgid "2015-01-04" +msgid "2015-04-26" msgstr "2015-01-04" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -#, no-wrap -msgid "5.0~a1-1" +#, fuzzy, no-wrap +#| msgid "5.0~a1-1" +msgid "5.0~a2-1" msgstr "5.0~a1-1" #. type: TH diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 53ecdf9..0204e3e 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-boot 5.0~a1-1\n" -"POT-Creation-Date: 2015-01-04 21:50+0100\n" +"Project-Id-Version: live-boot 5.0~a2-1\n" +"POT-Creation-Date: 2015-04-26 20:12+0200\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 "2015-01-04" +msgid "2015-04-26" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a1-1" +msgid "5.0~a2-1" msgstr "" #. type: TH diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 4e74bca..d78eb3c 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-boot 5.0~a1-1\n" -"POT-Creation-Date: 2015-01-04 21:50+0100\n" +"Project-Id-Version: live-boot 5.0~a2-1\n" +"POT-Creation-Date: 2015-04-26 20:12+0200\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 "2015-01-04" +msgid "2015-04-26" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a1-1" +msgid "5.0~a2-1" msgstr "" #. type: TH From d1d4af9b25661d047a3c5a739b5d1e991a863d88 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:24:39 +0000 Subject: [PATCH 14/31] Patch by Steven Shiau . The only changes so far are: * drop the parts of the patch that are not relevant to live-boot 5.x * adapt formatting to match Debian Live coding standards --- components/9990-misc-helpers.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 87c4930..315e3b1 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1318,7 +1318,19 @@ do_union () panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" + if ! mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" 2>/dev/null + then + # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 + # overlayfs in version >= v22 behaves differently + # + renamed from overlayfs to overlay + # + requires a workdir to become mounted + # + requires workdir and upperdir to reside under the same mount + # + requires workdir and upperdir to be in separate subdirs + mkdir ${unionrw}/rw + mkdir ${unionrw}/work + unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" + fi ;; esac } From 289f0d924b6fa009790b4a67164892107a5a4086 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:26:47 +0000 Subject: [PATCH 15/31] Removing attempt to mount overlayfs in an obsolete way. The version of overlayfs that reached Linux mainline does not support this mount call, no need to try it every time. --- components/9990-misc-helpers.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 315e3b1..5439e73 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1318,19 +1318,16 @@ do_union () panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" - if ! mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" 2>/dev/null - then - # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 - # overlayfs in version >= v22 behaves differently - # + renamed from overlayfs to overlay - # + requires a workdir to become mounted - # + requires workdir and upperdir to reside under the same mount - # + requires workdir and upperdir to be in separate subdirs - mkdir ${unionrw}/rw - mkdir ${unionrw}/work - unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" - fi + # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 + # overlayfs in version >= v22 behaves differently + # + renamed from overlayfs to overlay + # + requires a workdir to become mounted + # + requires workdir and upperdir to reside under the same mount + # + requires workdir and upperdir to be in separate subdirs + mkdir ${unionrw}/rw + mkdir ${unionrw}/work + unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; esac } From 7a9c73733e5254d36ddc5df87c5908e5cea3ea77 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:28:39 +0000 Subject: [PATCH 16/31] Cleaning up comment to keep only the part that's relevant here. --- components/9990-misc-helpers.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 5439e73..e1f2824 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1318,12 +1318,10 @@ do_union () panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" - # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 - # overlayfs in version >= v22 behaves differently - # + renamed from overlayfs to overlay - # + requires a workdir to become mounted - # + requires workdir and upperdir to reside under the same mount - # + requires workdir and upperdir to be in separate subdirs + # overlayfs requires: + # + a workdir to become mounted + # + workdir and upperdir to reside under the same mount + # + workdir and upperdir to be in separate directories mkdir ${unionrw}/rw mkdir ${unionrw}/work unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" From 469fb61ab8870f74f10aa8d4d235c3a57c47144b Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:30:53 +0000 Subject: [PATCH 17/31] Adding missing quotes. --- components/9990-misc-helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index e1f2824..21ddfb6 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1322,8 +1322,8 @@ do_union () # + a workdir to become mounted # + workdir and upperdir to reside under the same mount # + workdir and upperdir to be in separate directories - mkdir ${unionrw}/rw - mkdir ${unionrw}/work + mkdir "${unionrw}/rw" + mkdir "${unionrw}/work" unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; From 206a9bc0c758ac5f2fb55b52478de16c73bed680 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:31:07 +0000 Subject: [PATCH 18/31] Removing obsolete code. We're resetting this variable to a correct value a few lines below. --- components/9990-misc-helpers.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 21ddfb6..5fd8e3e 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1317,7 +1317,6 @@ do_union () then panic "overlay needs at least one lower filesystem (read-only branch)." fi - unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" # overlayfs requires: # + a workdir to become mounted # + workdir and upperdir to reside under the same mount From c5b6cb0b238bc8230a9366abafa73752dc093d27 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:31:53 +0000 Subject: [PATCH 19/31] Removing unused variables. --- components/9990-misc-helpers.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 5fd8e3e..4815553 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1305,9 +1305,6 @@ do_union () ;; overlay) - rw_opt="rw" - ro_opt="ro" - # XXX: can multiple unionro be used? (overlay only handles two dirs, but perhaps they can be chained?) # XXX: and can unionro be optional? i.e. can overlay skip lowerdir? if echo ${unionro} | grep -q " " From e24d836cde9a318659eacea5f76e5a2b634a0b91 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:33:58 +0000 Subject: [PATCH 20/31] Refactoring duplicate identical call to mount. --- components/9990-misc-helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 4815553..9318a4b 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1301,7 +1301,6 @@ do_union () unionmountopts="${unionmountopts}:${rofs}=${ro_opt}" done fi - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; overlay) @@ -1321,9 +1320,10 @@ do_union () mkdir "${unionrw}/rw" mkdir "${unionrw}/work" unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; esac + + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" } get_custom_mounts () From 9ab5aeeecac939f82c77536a6e21b505d9841b96 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 28 Apr 2015 07:05:31 +0200 Subject: [PATCH 21/31] Waiting until all ethernet devices are up on multi-nic machines, thanks to Chris Read (Closes: #744777). --- components/9990-select-eth-device.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/9990-select-eth-device.sh b/components/9990-select-eth-device.sh index 7d1aa16..df00666 100755 --- a/components/9990-select-eth-device.sh +++ b/components/9990-select-eth-device.sh @@ -24,6 +24,10 @@ Select_eth_device () # we want to do some basic IP modprobe -q af_packet + # Ensure all our net modules get loaded so we can actually compare MAC addresses... + udevadm trigger + udevadm settle + # Available Ethernet interfaces ? l_interfaces="" From 48fc69f2ba8b347e3216649fd895918743d05024 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 28 Apr 2015 07:19:38 +0200 Subject: [PATCH 22/31] Releasing debian version 5.0~a3-1. Signed-off-by: Daniel Baumann --- VERSION | 2 +- debian/changelog | 18 ++++++++++++++++++ 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/ja/live-boot.ja.7 | 2 +- manpages/ja/persistence.conf.ja.5 | 2 +- manpages/po/es/live-boot.7.po | 6 +++--- manpages/po/es/persistence.conf.5.po | 6 +++--- manpages/po/ja/live-boot.7.po | 8 +++----- manpages/po/ja/persistence.conf.5.po | 8 +++----- manpages/pot/live-boot.7.pot | 8 ++++---- manpages/pot/persistence.conf.5.pot | 8 ++++---- 14 files changed, 45 insertions(+), 31 deletions(-) diff --git a/VERSION b/VERSION index 4b5dad6..8e06629 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0~a2-1 +5.0~a3-1 diff --git a/debian/changelog b/debian/changelog index e464897..ad0ea66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +live-boot (5.0~a3-1) unstable; urgency=low + + [ Tails developers ] + * Patch by Steven Shiau . The only changes so far + are: + * Removing attempt to mount overlayfs in an obsolete way. + * Cleaning up comment to keep only the part that's relevant here. + * Adding missing quotes. + * Removing obsolete code. + * Removing unused variables. + * Refactoring duplicate identical call to mount. + + [ Daniel Baumann ] + * Waiting until all ethernet devices are up on multi-nic machines, + thanks to Chris Read (Closes: #744777). + + -- Daniel Baumann Tue, 28 Apr 2015 07:19:16 +0200 + live-boot (5.0~a2-1) unstable; urgency=low [ Tom Jampen ] diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index d391c19..87f645c 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2015\-04\-26 5.0~a2-1 "Live Systems Project" +.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3-1 "Live Systems Project" .SH NAME \fBlive\-boot\fR \- System Boot Components diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index d606fe3..edf6591 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2015\-04\-26 5.0~a2-1 "Live Systems Project" +.TH LIVE\-BOOT conf 2015\-04\-28 5.0~a3-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 e4985df..c49ad74 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 2015\-04\-26 5.0~a2\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3\-1 "Proyecto Live Systems" .SH NOMBRE \fBlive\-boot\fP \- Componentes de Arranque del Sistema diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 6f8bbf6..f612719 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 2015\-04\-26 5.0~a2\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT conf 2015\-04\-28 5.0~a3\-1 "Proyecto Live Systems" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7 index 7d0e38f..c4605b4 100644 --- a/manpages/ja/live-boot.ja.7 +++ b/manpages/ja/live-boot.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 2015\-04\-26 5.0~a2\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT 7 2015\-04\-28 5.0~a3\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-boot\fP \- システム起動構成要素 diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5 index 91cc46e..632f5e3 100644 --- a/manpages/ja/persistence.conf.ja.5 +++ b/manpages/ja/persistence.conf.ja.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 2015\-04\-26 5.0~a2\-1 "Live システムプロジェクト" +.TH LIVE\-BOOT conf 2015\-04\-28 5.0~a3\-1 "Live システムプロジェクト" .SH 名前 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 7e03daa..8aeb7a4 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-04-26 20:12+0200\n" +"POT-Creation-Date: 2015-04-28 07:19+0200\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -25,13 +25,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2015-04-26" +msgid "2015-04-28" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a2-1" +msgid "5.0~a3-1" msgstr "" #. type: TH diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 527a028..ed72e2e 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-04-26 20:12+0200\n" +"POT-Creation-Date: 2015-04-28 07:19+0200\n" "PO-Revision-Date: 2013-11-10 20:10+0900\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -23,13 +23,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2015-04-26" +msgid "2015-04-28" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a2-1" +msgid "5.0~a3-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po index 33a7075..1b77c20 100644 --- a/manpages/po/ja/live-boot.7.po +++ b/manpages/po/ja/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-04-26 20:12+0200\n" +"POT-Creation-Date: 2015-04-28 07:19+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -23,15 +23,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, fuzzy, no-wrap -#| msgid "2015-01-04" -msgid "2015-04-26" +msgid "2015-04-28" msgstr "2015-01-04" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, fuzzy, no-wrap -#| msgid "5.0~a1-1" -msgid "5.0~a2-1" +msgid "5.0~a3-1" msgstr "5.0~a1-1" #. type: TH diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po index 86a685e..e274bcf 100644 --- a/manpages/po/ja/persistence.conf.5.po +++ b/manpages/po/ja/persistence.conf.5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot\n" -"POT-Creation-Date: 2015-04-26 20:12+0200\n" +"POT-Creation-Date: 2015-04-28 07:19+0200\n" "PO-Revision-Date: 2015-01-05 05:50+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -23,15 +23,13 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, fuzzy, no-wrap -#| msgid "2015-01-04" -msgid "2015-04-26" +msgid "2015-04-28" msgstr "2015-01-04" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, fuzzy, no-wrap -#| msgid "5.0~a1-1" -msgid "5.0~a2-1" +msgid "5.0~a3-1" msgstr "5.0~a1-1" #. type: TH diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 0204e3e..9249b22 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-boot 5.0~a2-1\n" -"POT-Creation-Date: 2015-04-26 20:12+0200\n" +"Project-Id-Version: live-boot 5.0~a3-1\n" +"POT-Creation-Date: 2015-04-28 07:19+0200\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 "2015-04-26" +msgid "2015-04-28" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a2-1" +msgid "5.0~a3-1" msgstr "" #. type: TH diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index d78eb3c..7ee3cef 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-boot 5.0~a2-1\n" -"POT-Creation-Date: 2015-04-26 20:12+0200\n" +"Project-Id-Version: live-boot 5.0~a3-1\n" +"POT-Creation-Date: 2015-04-28 07:19+0200\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 "2015-04-26" +msgid "2015-04-28" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "5.0~a2-1" +msgid "5.0~a3-1" msgstr "" #. type: TH From b6c5221a9c9b2c2020ba1b53ff618cf972d1b2f8 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Tue, 16 Dec 2014 14:09:55 +0100 Subject: [PATCH 23/31] Logging a warning when an expected image file is missing. --- components/9990-overlay.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 9282276..a64c78b 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -117,6 +117,8 @@ setup_unionfs () log_begin_msg "Mounting \"${image}\" on \"${mpoint}\" via \"${backdev}\"" mount -t "${fstype}" -o ro,noatime "${backdev}" "${mpoint}" || panic "Can not mount ${backdev} (${image}) on ${mpoint}" log_end_msg + else + log_warning_msg "Could not find image '${image}'. Most likely it is listed in a .module file, perhaps by mistake." fi done else From 94de28deace2c7c3df13790f326f9206d5fe898e Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:24:39 +0000 Subject: [PATCH 24/31] Patch by Steven Shiau . The only changes so far are: * drop the parts of the patch that are not relevant to live-boot 5.x * adapt formatting to match Debian Live coding standards --- components/9990-misc-helpers.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 9318a4b..e58f283 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1313,13 +1313,20 @@ do_union () then panic "overlay needs at least one lower filesystem (read-only branch)." fi - # overlayfs requires: - # + a workdir to become mounted - # + workdir and upperdir to reside under the same mount - # + workdir and upperdir to be in separate directories - mkdir "${unionrw}/rw" - mkdir "${unionrw}/work" - unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" + unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" + if ! mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" 2>/dev/null + then + # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 + # overlayfs in version >= v22 behaves differently + # + renamed from overlayfs to overlay + # + requires a workdir to become mounted + # + requires workdir and upperdir to reside under the same mount + # + requires workdir and upperdir to be in separate subdirs + mkdir ${unionrw}/rw + mkdir ${unionrw}/work + unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" + fi ;; esac From aebd12f70f50d59c2f7afe1923087e3c61dce3c1 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:26:47 +0000 Subject: [PATCH 25/31] Removing attempt to mount overlayfs in an obsolete way. The version of overlayfs that reached Linux mainline does not support this mount call, no need to try it every time. --- components/9990-misc-helpers.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index e58f283..25d6fd7 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1314,19 +1314,16 @@ do_union () panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" - if ! mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" 2>/dev/null - then - # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 - # overlayfs in version >= v22 behaves differently - # + renamed from overlayfs to overlay - # + requires a workdir to become mounted - # + requires workdir and upperdir to reside under the same mount - # + requires workdir and upperdir to be in separate subdirs - mkdir ${unionrw}/rw - mkdir ${unionrw}/work - unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" - fi + # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 + # overlayfs in version >= v22 behaves differently + # + renamed from overlayfs to overlay + # + requires a workdir to become mounted + # + requires workdir and upperdir to reside under the same mount + # + requires workdir and upperdir to be in separate subdirs + mkdir ${unionrw}/rw + mkdir ${unionrw}/work + unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; esac From 822706beb66f72389dc5e9328b52f1a9c0da04fe Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:28:39 +0000 Subject: [PATCH 26/31] Cleaning up comment to keep only the part that's relevant here. --- components/9990-misc-helpers.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 25d6fd7..c59e40e 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1314,12 +1314,10 @@ do_union () panic "overlay needs at least one lower filesystem (read-only branch)." fi unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" - # Ref: kiwi from OpenSuse kiwi-7.02.18-1.1 - # overlayfs in version >= v22 behaves differently - # + renamed from overlayfs to overlay - # + requires a workdir to become mounted - # + requires workdir and upperdir to reside under the same mount - # + requires workdir and upperdir to be in separate subdirs + # overlayfs requires: + # + a workdir to become mounted + # + workdir and upperdir to reside under the same mount + # + workdir and upperdir to be in separate directories mkdir ${unionrw}/rw mkdir ${unionrw}/work unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" From 1d3f7a8c955d20ac4b442719de70d9ed7406d201 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:30:53 +0000 Subject: [PATCH 27/31] Adding missing quotes. --- components/9990-misc-helpers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index c59e40e..e3b382b 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1318,8 +1318,8 @@ do_union () # + a workdir to become mounted # + workdir and upperdir to reside under the same mount # + workdir and upperdir to be in separate directories - mkdir ${unionrw}/rw - mkdir ${unionrw}/work + mkdir "${unionrw}/rw" + mkdir "${unionrw}/work" unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; From d99dfbf1fc7b6a4fcdc128396c40e24d638cfcaf Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:31:07 +0000 Subject: [PATCH 28/31] Removing obsolete code. We're resetting this variable to a correct value a few lines below. --- components/9990-misc-helpers.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index e3b382b..0c8b74e 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1313,7 +1313,6 @@ do_union () then panic "overlay needs at least one lower filesystem (read-only branch)." fi - unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}" # overlayfs requires: # + a workdir to become mounted # + workdir and upperdir to reside under the same mount From cf125f86f9985e09b00c28bd9fc8903810f98f79 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 15 Feb 2015 17:33:58 +0000 Subject: [PATCH 29/31] Refactoring duplicate identical call to mount. --- components/9990-misc-helpers.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 0c8b74e..9318a4b 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -1320,7 +1320,6 @@ do_union () mkdir "${unionrw}/rw" mkdir "${unionrw}/work" unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/rw,workdir=${unionrw}/work" - mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" ;; esac From 72211f19cc0f386166fc348ddb22c169e2b1fbbc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 17 May 2015 20:58:07 +0200 Subject: [PATCH 30/31] Switching default union filesystem to overlay, wheezy systems can use union=aufs for the time being. --- components/9990-cmdline-old | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old index bdb7624..efb33c1 100755 --- a/components/9990-cmdline-old +++ b/components/9990-cmdline-old @@ -266,7 +266,7 @@ Cmdline_old () if [ -z "${UNIONTYPE}" ] then - UNIONTYPE="aufs" + UNIONTYPE="overlay" export UNIONTYPE fi From ab09402f047b79767ad44c69ae48f5e46dcf1f77 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 17 May 2015 21:04:13 +0200 Subject: [PATCH 31/31] Releasing debian version 5.0~a4-1. Signed-off-by: Daniel Baumann --- debian/changelog | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/debian/changelog b/debian/changelog index ad0ea66..d50a0aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +live-boot (5.0~a4-1) unstable; urgency=low + + [ Tails developers ] + * Logging a warning when an expected image file is missing. + * Patch by Steven Shiau . The only changes so far + are: + * Removing attempt to mount overlayfs in an obsolete way. + * Cleaning up comment to keep only the part that's relevant here. + * Adding missing quotes. + * Removing obsolete code. + * Refactoring duplicate identical call to mount. + + [ Daniel Baumann ] + * Switching default union filesystem to overlay, wheezy systems can use + union=aufs for the time being. + + -- Daniel Baumann Sun, 17 May 2015 21:04:01 +0200 + live-boot (5.0~a3-1) unstable; urgency=low [ Tails developers ]