From: Daniel Baumann Date: Mon, 6 May 2013 12:37:26 +0000 (+0200) Subject: Adding upstream version 4.0~a8. X-Git-Tag: upstream/4.0_a8^0 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=919b32db2c858e23da7dd52b6501127ddc108feb Adding upstream version 4.0~a8. --- diff --git a/Makefile b/Makefile index 9d03254..d083027 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ test: echo " done."; \ else \ echo "W: checkbashisms - command not found"; \ - echo "I: checkbashisms can be optained from: "; \ + echo "I: checkbashisms can be obtained from: "; \ echo "I: http://git.debian.org/?p=devscripts/devscripts.git"; \ echo "I: On Debian based systems, checkbashisms can be installed with:"; \ echo "I: apt-get install devscripts"; \ diff --git a/VERSION b/VERSION index 2b29e05..316b63d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0~a7-1 +4.0~a8-1 diff --git a/scripts/boot/0010-dracut b/backends/dracut/live.script similarity index 83% rename from scripts/boot/0010-dracut rename to backends/dracut/live.script index 19db182..2f29e70 100755 --- a/scripts/boot/0010-dracut +++ b/backends/dracut/live.script @@ -2,6 +2,8 @@ #set -e +. /lib/live/boot.sh + DRACUT_FIXME () { # dracut entry point for live-boot is FIXME(); function diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index d66c669..1814211 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -45,7 +45,6 @@ do copy_exec "${FILE}" done -# wheezy/sid if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] then mkdir -p ${DESTDIR}/lib/udev/rules.d @@ -172,11 +171,6 @@ then [ "${QUIET}" ] || echo -n " udev" copy_exec /sbin/udevadm fi -if [ -x /usr/bin/udevinfo ] -then - [ "${QUIET}" ] || echo -n " udev" - copy_exec /usr/bin/udevinfo /bin -fi # Program: wget if [ -x /usr/bin/wget ] diff --git a/backends/initramfs-tools/live.script b/backends/initramfs-tools/live.script index 46576fb..1c6ebbf 100755 --- a/backends/initramfs-tools/live.script +++ b/backends/initramfs-tools/live.script @@ -2,7 +2,12 @@ #set -e -if [ -e /lib/live/boot.sh ] -then - . /lib/live/boot.sh -fi +. /lib/live/boot.sh + +. /scripts/functions + +mountroot () +{ + # initramfs-tools entry point for live-boot is mountroot(); function + Main +} diff --git a/manpages/Makefile b/manpages/Makefile index fd6298f..e488b68 100644 --- a/manpages/Makefile +++ b/manpages/Makefile @@ -23,7 +23,7 @@ build: po4a.cfg @if [ ! -x "$$(which po4a 2>/dev/null)" ]; \ then \ echo "E: po4a - command not found"; \ - echo "I: po4a can be optained from:"; \ + echo "I: po4a can be obtained from:"; \ echo "I: http://po4a.alioth.debian.org/"; \ echo "I: On Debian based systems, po4a can be installed with:"; \ echo "I: apt-get install po4a"; \ diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 7c5dc92..a5bbbf7 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 19.02.2013 4.0~a7\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 10.03.2013 4.0~a8\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 index f6ed65f..29fc7e3 100644 --- a/manpages/de/persistence.conf.de.5 +++ b/manpages/de/persistence.conf.de.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 19.02.2013 4.0~a7\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 10.03.2013 4.0~a8\-1 "Debian Live Project" .SH NAME \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index d995c77..3eeb080 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2013\-02\-19 4.0~a7-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2013\-03\-10 4.0~a8-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index 63a2439..fcbb784 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2013\-02\-19 4.0~a7-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2013\-03\-10 4.0~a8-1 "Debian Live Project" .SH NAME \fBpersistence.conf\fR \- Configuration file for persistence media in diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index 3a9c044..fad6c03 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 19.02.2013 4.0~a7\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 10.03.2013 4.0~a8\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 8b624a6..d610e14 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 19.02.2013 4.0~a7\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 10.03.2013 4.0~a8\-1 "Proyecto Debian Live" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index c7f1c3d..dda9ecd 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a7-1\n" -"POT-Creation-Date: 2013-02-19 05:48+0100\n" +"Project-Id-Version: live-boot 4.0~a8-1\n" +"POT-Creation-Date: 2013-03-10 19:02+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-19" -msgstr "19.02.2013" +msgid "2013-03-10" +msgstr "10.03.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a7-1" -msgstr "4.0~a7-1" +msgid "4.0~a8-1" +msgstr "4.0~a8-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index 7758741..aae7018 100644 --- a/manpages/po/de/persistence.conf.5.po +++ b/manpages/po/de/persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a7-1\n" -"POT-Creation-Date: 2013-02-19 05:48+0100\n" +"Project-Id-Version: live-boot 4.0~a8-1\n" +"POT-Creation-Date: 2013-03-10 19:02+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-19" -msgstr "19.02.2013" +msgid "2013-03-10" +msgstr "10.03.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a7-1" -msgstr "4.0~a7-1" +msgid "4.0~a8-1" +msgstr "4.0~a8-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 3efe967..6b1f0fa 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a7-1\n" -"POT-Creation-Date: 2013-02-19 05:48+0100\n" +"Project-Id-Version: live-boot 4.0~a8-1\n" +"POT-Creation-Date: 2013-03-10 19:02+0100\n" "PO-Revision-Date: 2013-02-12 14:25+0100\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-19" -msgstr "19.02.2013" +msgid "2013-03-10" +msgstr "10.03.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a7-1" -msgstr "4.0~a7-1" +msgid "4.0~a8-1" +msgstr "4.0~a8-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 30c2e23..4faa195 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a7-1\n" -"POT-Creation-Date: 2013-02-19 05:48+0100\n" +"Project-Id-Version: live-boot 4.0~a8-1\n" +"POT-Creation-Date: 2013-03-10 19:02+0100\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" "Language-Team: none\n" @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2013-02-19" -msgstr "19.02.2013" +msgid "2013-03-10" +msgstr "10.03.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a7-1" -msgstr "4.0~a7-1" +msgid "4.0~a8-1" +msgstr "4.0~a8-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index d4a5d3a..0e53755 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-02-19 05:48+0100\n" +"POT-Creation-Date: 2013-03-10 19:02+0100\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 "2013-02-19" +msgid "2013-03-10" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a7-1" +msgid "4.0~a8-1" msgstr "" #. type: TH diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index e5b8b26..473b762 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-02-19 05:48+0100\n" +"POT-Creation-Date: 2013-03-10 19:02+0100\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 "2013-02-19" +msgid "2013-03-10" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a7-1" +msgid "4.0~a8-1" msgstr "" #. type: TH diff --git a/scripts/boot/0020-initramfs-tools b/scripts/boot/0020-initramfs-tools deleted file mode 100755 index c251443..0000000 --- a/scripts/boot/0020-initramfs-tools +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -#set -e - -if [ -e /scripts/functions ] -then - . /scripts/functions -fi - -mountroot () -{ - # initramfs-tools entry point for live-boot is mountroot(); function - Main -} diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 888eeaf..cb3940b 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -1140,12 +1140,12 @@ link_files () # is non-empty, remove mask from all source paths when # creating links (will be necessary if we change root, which # live-boot normally does (into $rootmnt)). - local src_dir dest_dir src_mask + local src_dir dest_dir src_transform # remove multiple /:s and ensure ending on / src_dir="$(trim_path ${1})/" dest_dir="$(trim_path ${2})/" - src_mask="${3}" + src_transform="${3}" # This check can only trigger on the inital, non-recursive call since # we create the destination before recursive calls @@ -1172,12 +1172,12 @@ link_files () chown_ref "${src}" "${dest}" chmod_ref "${src}" "${dest}" fi - link_files "${src}" "${dest}" "${src_mask}" + link_files "${src}" "${dest}" "${src_transform}" else final_src=${src} - if [ -n "${src_mask}" ] + if [ -n "${src_transform}" ] then - final_src="$(echo ${final_src} | sed "s|^${src_mask}||")" + final_src="$(echo ${final_src} | sed "${src_transform}")" fi rm -rf "${dest}" 2> /dev/null ln -s "${final_src}" "${dest}" @@ -1482,7 +1482,7 @@ activate_custom_mounts () # ignore the loop below and set rootfs_dest_backing=$dest local rootfs_dest_backing rootfs_dest_backing="" - if [ -n "${opt_link}"] + if [ -n "${opt_link}" ] then for d in /live/rootfs/* do @@ -1502,7 +1502,7 @@ activate_custom_mounts () local cow_dir links_source if [ -n "${opt_link}" ] && [ -z "${PERSISTENCE_READONLY}" ] then - link_files ${source} ${dest} ${rootmnt} + link_files ${source} ${dest} "s|^/live/|/lib/live/mount/|" elif [ -n "${opt_link}" ] && [ -n "${PERSISTENCE_READONLY}" ] then mkdir -p ${rootmnt}/lib/live/mount/persistence @@ -1519,7 +1519,7 @@ activate_custom_mounts () chown_ref "${source}" "${cow_dir}" chmod_ref "${source}" "${cow_dir}" do_union ${links_source} ${cow_dir} ${source} ${rootfs_dest_backing} - link_files ${links_source} ${dest} ${rootmnt} + link_files ${links_source} ${dest} "s|^${rootmnt}||" elif [ -n "${opt_union}" ] && [ -z "${PERSISTENCE_READONLY}" ] then do_union ${dest} ${source} ${rootfs_dest_backing} diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 10054e8..c6de171 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -392,7 +392,7 @@ setup_unionfs () # Close unused overlays (e.g. due to missing $persistence_list) for overlay in ${overlay_devices} do - if echo ${used_overlays} | grep -qve "^\(.* \)\?${device}\( .*\)\?$" + if echo ${used_overlays} | grep -qve "^\(.* \)\?${overlay}\( .*\)\?$" then close_persistence_media ${overlay} fi diff --git a/scripts/boot/FIXME b/scripts/boot/FIXME index f3c62c5..be8bb32 100644 --- a/scripts/boot/FIXME +++ b/scripts/boot/FIXME @@ -8,7 +8,7 @@ Additionally, this will allow us to abstract initramfs-tools integration to also support other initrd generators, such as dracut. -Unfortunately, from a developers point of view, we could no +Unfortunately, from a developers point of view, we could not finish this in time for wheezy, but we will finish this for jessie. Please excuse the sorry state of the 9990-* scripts. From a users point of view, it doesn't matter at all though. @@ -17,8 +17,6 @@ From a users point of view, it doesn't matter at all though. Scripts overview ---------------- -00xx initramfs "bootstrapping" - 0xxx live-boot internals 1xxx find and mount rootfs