From 12987b7f06549a0b5e53872dce576e0c25a8827a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 16 Aug 2012 12:24:30 +0200 Subject: [PATCH] Adding upstream version 3.0~b1. --- Makefile | 5 +- VERSION | 2 +- backends/initramfs-tools/live.hook | 55 ++++++++++---------- bin/live-new-uuid | 86 ------------------------------- manpages/de/live-boot.de.7 | 10 ++-- manpages/de/live-persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 8 +-- manpages/en/live-persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 17 ++---- manpages/es/live-persistence.conf.es.5 | 7 +-- manpages/po/de/live-boot.7.po | 18 +++---- manpages/po/de/live-persistence.conf.5.po | 10 ++-- manpages/po/es/live-boot.7.po | 39 ++++++-------- manpages/po/es/live-persistence.conf.5.po | 21 +++----- manpages/pot/live-boot.7.pot | 14 ++--- manpages/pot/live-persistence.conf.5.pot | 6 +-- scripts/boot.sh | 10 ++++ scripts/boot/0020-initramfs-tools | 5 ++ scripts/boot/0110-debug | 13 +++-- scripts/boot/0120-read-only | 12 +++-- scripts/boot/3010-verify-checksums | 12 +++-- scripts/boot/3020-swapon | 12 +++-- scripts/boot/9990-aaa-fixme.sh | 6 --- scripts/boot/9990-main.sh | 5 ++ scripts/boot/9990-netbase.sh | 13 +++++ scripts/boot/9990-networking.sh | 12 +++++ scripts/boot/9990-overlay.sh | 9 +++- scripts/boot/README | 21 +++++++- 28 files changed, 198 insertions(+), 234 deletions(-) delete mode 100755 bin/live-new-uuid diff --git a/Makefile b/Makefile index b3c7ba2..9d03254 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL := sh -e LANGUAGES = $(shell cd manpages/po && ls) -SCRIPTS = backends/*/* bin/* scripts/*.sh scripts/*/* +SCRIPTS = backends/*/* bin/* scripts/*.sh scripts/*/*-* all: build @@ -46,9 +46,6 @@ install: cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live # Installing executables - mkdir -p $(DESTDIR)/sbin - cp bin/live-new-uuid bin/live-swapfile $(DESTDIR)/sbin - mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts diff --git a/VERSION b/VERSION index cf9496d..cd57b67 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a38-1 +3.0~b1-1 diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 78aae2e..89420b6 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -6,19 +6,15 @@ set -e [ "${QUIET}" ] || echo -n "live-boot:" -# Reading configuration files -if [ -e /etc/live/boot.conf ] -then - . /etc/live/boot.conf -fi - -if ls /etc/live/boot.d/*.conf > /dev/null 2>&1 -then - for _FILE in /etc/live/boot.d/*.conf - do - . ${_FILE} - done -fi +# Reading configuration file from filesystem and live-media +for _FILE in /etc/live/boot.conf /etc/live/boot/* \ + /live/image/live/boot.conf /live/image/live/boot/* +do + if [ -e "${_FILE}" ] + then + . "${_FILE}" + fi +done # Checking live-boot if [ ! -e /lib/live/boot ] @@ -46,11 +42,7 @@ done # udev dependencies for FILE in /lib/udev/*_id do - if [ ! -e "${DESTDIR}/${FILE}" ] - then - mkdir -p "${DESTDIR}/lib/udev" - copy_exec "${FILE}" /lib/udev - fi + copy_exec "${FILE}" done # wheezy/sid @@ -65,7 +57,7 @@ fi # Configuration: keymap (usefull when using encryption) if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ] then - copy_exec /bin/loadkeys /bin + copy_exec /bin/loadkeys mkdir -p "${DESTDIR}"/etc cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc @@ -84,7 +76,7 @@ manual_add_modules btrfs # Filesystem: cifs if [ -x /sbin/mount.cifs ] then - copy_exec /sbin/mount.cifs /sbin + copy_exec /sbin/mount.cifs manual_add_modules cifs fi @@ -101,7 +93,7 @@ then fi # Filesystem: squashfs -copy_exec /sbin/losetup /sbin +copy_exec /sbin/losetup manual_add_modules loop manual_add_modules squashfs manual_add_modules sqlzma @@ -166,7 +158,7 @@ fi if [ -x /sbin/udevadm ] then [ "${QUIET}" ] || echo -n " udev" - copy_exec /sbin/udevadm /sbin + copy_exec /sbin/udevadm fi if [ -x /usr/bin/udevinfo ] then @@ -185,7 +177,7 @@ fi if [ -x /sbin/blockdev ] then [ "${QUIET}" ] || echo -n " blockdev" - copy_exec /sbin/blockdev /sbin + copy_exec /sbin/blockdev fi # FUSE kernel module @@ -225,13 +217,18 @@ case "${LIVE_DNS}" in true) [ "${QUIET}" ] || echo -n " dns" - #copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd - copy_exec /lib/libnss_dns.so.* /lib # DNS server - #copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd + # /lib/libnss_dns.so.*:a DNS + # /lib/libnss_files.so.*: /etc/hosts and /etc/passwd + # /lib/libnss_compat.so.*: /etc/passwd + + for _SHLIB in $(find /lib -name 'libnss_dns.so.*') + do + copy_exec "${_SHLIB}" + done - # Configuration file - may be needed if /etc/hosts is used. - #mkdir -p $DESTDIR/etc - #cp -p /etc/nsswitch.conf $DESTDIR/etc + # might be needed if /etc/hosts is used + #mkdir -p "${DESTDIR}/etc" + #cp -p /etc/nsswitch.conf "${DESTDIR}/etc" ;; esac diff --git a/bin/live-new-uuid b/bin/live-new-uuid deleted file mode 100755 index 2e29f6a..0000000 --- a/bin/live-new-uuid +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# -*- coding: utf-8 -*- -# -# «live-new-uuid» - Creates and injects new UUIDs for live disks -# -# Create new UUIDs for disks to prevent conflicts and booting the wrong live -# directory. Particularly useful in creating recovery disks that need to be -# able to also work with recovery partitioning schemes. -# -# Copyright (C) 2008, Dell Inc. -# -# Author: -# - Mario Limonciello -# -# This script is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this application; if not, write to the Free Software Foundation, Inc., 51 -# Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -################################################################################## - -set -e - -help() { - echo - echo "USAGE: $0 initrd.{l,g}z " - echo - echo "initrd.{l,g}z is the absolute path to the original gzipped or lzmaed initramfs" - echo " is the destination directory for the new compressed initramfs" - echo " is the destination directory for the new live-uuid-TYPE " - echo - echo "if either path is absent, they will end up in the current directory " - echo "TYPE is determined by an already existing live-uuid-* or by 'uname -s'" -} - -if [ "$#" = "0" ] || [ "x$1" = x-h ] || [ "x$1" = x--help ]; then - help - exit 3 -fi - -CWD=`pwd` -TEMPDIR=`mktemp -d /tmp/uuid-XXXXXX` -TYPE=`uname -r | cut -d '-' -f 3` - -if echo "$1" | grep ".lz$" >/dev/null; then - COMPRESSOR="lzma" - SUFFIX=".lz" -elif echo "$1" | grep ".gz$" >/dev/null; then - COMPRESSOR="gzip" - SUFFIX=".gz" -else - echo "Unsupported archive type." - exit 2 -fi - -if [ -z "$2" ] || [ ! -d "$2" ] || [ "$2" = "." ]; then - COMPRESS_DIR="$CWD" -else - COMPRESS_DIR="$2" -fi - -if [ -z "$3" ] || [ ! -d "$3" ] || [ "$3" = "." ]; then - LIVEDIR="$CWD" -else - LIVEDIR="$3" -fi - -cd "$TEMPDIR" -$COMPRESSOR -cd "$1" -S "$SUFFIX" | cpio -id -uuidgen -r > conf/uuid.conf -find . | cpio --quiet --dereference -o -H newc | $COMPRESSOR -9c > "$COMPRESS_DIR/initrd$SUFFIX" -if [ "$(ls "$LIVEDIR/live-uuid"-* >/dev/null 2>&1 | wc -l)" = 1 ]; then - cp conf/uuid.conf "$LIVEDIR/live-uuid"-* -else - cp conf/uuid.conf "$LIVEDIR/live-uuid-$TYPE" -fi -cd "$CWD" -rm -rf "$TEMPDIR" diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 4e0d950..adee57a 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 27.07.2012 3.0~a38\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 16.08.2012 3.0~b1\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts @@ -41,8 +41,8 @@ see below. .SS "Configuration Files" \fBlive\-boot\fP can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself -(/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media -(live/boot.conf, live/boot.d/*.conf). +(/etc/live/boot.conf, /etc/live/boot/*), or on the live media +(live/boot.conf, live/boot/*). .SH OPTIONS .\" FIXME @@ -260,9 +260,9 @@ loaded in alphanumeric order. .SH FILES .IP \fB/etc/live/boot.conf\fP 4 -.IP \fB/etc/live/boot.d/*.conf\fP 4 +.IP \fB/etc/live/boot/*\fP 4 .IP \fBlive/boot.conf\fP 4 -.IP \fBlive/boot.d/*.conf\fP 4 +.IP \fBlive/boot/*\fP 4 .IP \fBlive\-persistence.conf\fP 4 .SH "SEE ALSO" diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5 index 79e62e7..91e19d8 100644 --- a/manpages/de/live-persistence.conf.de.5 +++ b/manpages/de/live-persistence.conf.de.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 27.07.2012 3.0~a38\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 16.08.2012 3.0~b1\-1 "Debian Live Project" .SH NAME \fBlive\-persistence.conf\fP \- Configuration file for persistence media in diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 670fc71..dca0a8f 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2012\-07\-27 3.0~a38-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-08\-16 3.0~b1-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts @@ -23,7 +23,7 @@ To configure the live\-boot parameters used by default in a live image, see the In addition, there are some more boot parameters to influence the behaviour, see below. .SS Configuration Files -\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot.conf, live/boot.d/*.conf). +\fBlive\-boot\fR can be configured (but not activated) through configuration files. Those files can be placed either in the root filesystem itself (/etc/live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, live/boot/*). .SH OPTIONS \fBlive\-boot\fR currently features the following parameters. @@ -148,9 +148,9 @@ This optional file (inside the live media) contains a list of white\-space or ca .SH FILES .IP "\fB/etc/live/boot.conf\fR" 4 -.IP "\fB/etc/live/boot.d/*.conf\fR" 4 +.IP "\fB/etc/live/boot/*\fR" 4 .IP "\fBlive/boot.conf\fR" 4 -.IP "\fBlive/boot.d/*.conf\fR" 4 +.IP "\fBlive/boot/*\fR" 4 .IP "\fBlive-persistence.conf\fR" 4 .SH SEE ALSO diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5 index 18ae4c9..d6498e0 100644 --- a/manpages/en/live-persistence.conf.5 +++ b/manpages/en/live-persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2012\-07\-27 3.0~a38-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-08\-16 3.0~b1-1 "Debian Live Project" .SH NAME \fBlive-persistence.conf\fR \- Configuration file for persistence media in diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index 2dc590d..8227a22 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 27.07.2012 3.0~a38\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 16.08.2012 3.0~b1\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema @@ -42,8 +42,8 @@ comportamiento, ver más abajo. .SS "Ficheros de configuración" \fBlive\-boot\fP se puede configurar (pero no activar) mediante ficheros de configuración. Estos ficheros se pueden colocar en el sistema de ficheros -raíz (/etc/live/boot.conf, /etc/live/boot.d/*.conf), o en el medio en vivo -(live/boot.conf, live/boot.d/*.conf). +raíz (/etc/live/boot.conf, /etc/live/boot/*), o en el medio en vivo +(live/boot.conf, live/boot/*). .SH OPCIONES .\" FIXME @@ -263,12 +263,10 @@ unionfs. .\" FIXME .SH "FICHEROS (antiguos)" .IP \fB/etc/live.conf\fP 4 -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# Algunas variables pueden ser configuradas a través de este fichero de configuración (dentro del sistema en vivo). .IP \fBlive/filesystem.module\fP 4 .\" FIXME -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# Este fichero opcional (dentro del medio en vivo) contiene una lista de nombres de ficheros separados por espacios en blanco o retornos de carro que corresponden a imágenes de disco en el directorio "/live". Si este fichero @@ -281,9 +279,9 @@ alfanumérico. .SH FICHEROS .IP \fB/etc/live/boot.conf\fP 4 -.IP \fB/etc/live/boot.d/*.conf\fP 4 +.IP \fB/etc/live/boot/*\fP 4 .IP \fBlive/boot.conf\fP 4 -.IP \fBlive/boot.d/*.conf\fP 4 +.IP \fBlive/boot.d/*\fP 4 .IP \fBlive\-persistence.conf\fP 4 .SH "VER ADEMÁS" @@ -296,11 +294,6 @@ alfanumérico. \fIlive\-tools\fP(7) .SH "PÁGINA WEB" -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# -Se puede encontrar más información acerca de live\-boot y el proyecto Debian -Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en -<\fIhttp://live.debian.net/manual/\fP>. -#\-#\-#\-#\-# live\-persistence.conf.5.po (live\-persistence.conf) #\-#\-#\-#\-# Se puede encontrar más información acerca de live\-boot y el proyecto Debian Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en <\fIhttp://live.debian.net/manual/\fP>. diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5 index e8a5f2d..036b7ae 100644 --- a/manpages/es/live-persistence.conf.es.5 +++ b/manpages/es/live-persistence.conf.es.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 27.07.2012 3.0~a38\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 16.08.2012 3.0~b1\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento @@ -209,11 +209,6 @@ tendría que ser copiado en \fIVOL\fP/usr durante la preinstalación inicial. \fIlive\-tools\fP(7) .SH "PÁGINA WEB" -#\-#\-#\-#\-# live\-boot.7.po (live\-boot) #\-#\-#\-#\-# -Se puede encontrar más información acerca de live\-boot y el proyecto Debian -Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en -<\fIhttp://live.debian.net/manual/\fP>. -#\-#\-#\-#\-# live\-persistence.conf.5.po (live\-persistence.conf) #\-#\-#\-#\-# Se puede encontrar más información acerca de live\-boot y el proyecto Debian Live en la página web <\fIhttp://live.debian.net/\fP> y en el manual en <\fIhttp://live.debian.net/manual/\fP>. diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 7d0eafa..20b8783 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a38-1\n" -"POT-Creation-Date: 2012-07-27 00:21+0300\n" +"Project-Id-Version: live-boot 3.0~b1-1\n" +"POT-Creation-Date: 2012-08-16 12:13+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,13 +24,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-07-27" -msgstr "27.07.2012" +msgid "2012-08-16" +msgstr "16.08.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a38-1" +msgid "3.0~b1-1" msgstr "" #. type: TH @@ -132,8 +132,8 @@ msgstr "" msgid "" "B can be configured (but not activated) through configuration " "files. Those files can be placed either in the root filesystem itself (/etc/" -"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot." -"conf, live/boot.d/*.conf)." +"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, " +"live/boot/*)." msgstr "" #. type: SH @@ -821,7 +821,7 @@ msgstr "" #. type: IP #: en/live-boot.7:151 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: IP @@ -833,7 +833,7 @@ msgstr "" #. type: IP #: en/live-boot.7:153 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: IP diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po index f098249..33bb817 100644 --- a/manpages/po/de/live-persistence.conf.5.po +++ b/manpages/po/de/live-persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a38-1\n" -"POT-Creation-Date: 2012-07-27 00:21+0300\n" +"Project-Id-Version: live-boot 3.0~b1-1\n" +"POT-Creation-Date: 2012-08-16 12:13+0300\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,13 +24,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-07-27" -msgstr "27.07.2012" +msgid "2012-08-16" +msgstr "16.08.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a38-1" +msgid "3.0~b1-1" msgstr "" #. type: TH diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index a4c63df..3148a86 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -4,12 +4,12 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a38-1\n" -"POT-Creation-Date: 2012-07-27 00:21+0300\n" +"Project-Id-Version: live-boot 3.0~b1-1\n" +"POT-Creation-Date: 2012-08-16 12:13+0300\n" "PO-Revision-Date: 2012-06-07 20:29+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" -"Language-Team: none\n" -"Language: es\n" +"Language-Team: Debian Live \n" +"Language: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-07-27" -msgstr "27.07.2012" +msgid "2012-08-16" +msgstr "16.08.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a38-1" -msgstr "3.0~a38-1" +msgid "3.0~b1-1" +msgstr "3.0~b1-1" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 @@ -152,13 +152,13 @@ msgstr "Ficheros de configuración" msgid "" "B can be configured (but not activated) through configuration " "files. Those files can be placed either in the root filesystem itself (/etc/" -"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot." -"conf, live/boot.d/*.conf)." +"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, " +"live/boot/*)." msgstr "" "B se puede configurar (pero no activar) mediante ficheros de " "configuración. Estos ficheros se pueden colocar en el sistema de ficheros " -"raíz (/etc/live/boot.conf, /etc/live/boot.d/*.conf), o en el medio en vivo " -"(live/boot.conf, live/boot.d/*.conf)." +"raíz (/etc/live/boot.conf, /etc/live/boot/*), o en el medio en vivo (live/" +"boot.conf, live/boot/*)." #. type: SH #: en/live-boot.7:28 en/live-persistence.conf.5:57 @@ -962,7 +962,6 @@ msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" -"#-#-#-#-# live-boot.7.po (live-boot) #-#-#-#-#\n" "Algunas variables pueden ser configuradas a través de este fichero de " "configuración (dentro del sistema en vivo)." @@ -985,7 +984,6 @@ msgid "" "below /overlay. Without this file, any images in the \"/live\" directory " "are loaded in alphanumeric order." msgstr "" -"#-#-#-#-# live-boot.7.po (live-boot) #-#-#-#-#\n" "Este fichero opcional (dentro del medio en vivo) contiene una lista de " "nombres de ficheros separados por espacios en blanco o retornos de carro que " "corresponden a imágenes de disco en el directorio \"/live\". Si este fichero " @@ -1011,8 +1009,8 @@ msgstr "B" #. type: IP #: en/live-boot.7:151 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" #. type: IP #: en/live-boot.7:152 @@ -1023,8 +1021,8 @@ msgstr "B" #. type: IP #: en/live-boot.7:153 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" #. type: IP #: en/live-boot.7:154 @@ -1071,11 +1069,6 @@ msgid "" "the homepage at EIE and in the manual at " "EIE." msgstr "" -"#-#-#-#-# live-boot.7.po (live-boot) #-#-#-#-#\n" -"Se puede encontrar más información acerca de live-boot y el proyecto Debian " -"Live en la página web EIE y en el manual en " -"EIE.\n" -"#-#-#-#-# live-persistence.conf.5.po (live-persistence.conf) #-#-#-#-#\n" "Se puede encontrar más información acerca de live-boot y el proyecto Debian " "Live en la página web EIE y en el manual en " "EIE." diff --git a/manpages/po/es/live-persistence.conf.5.po b/manpages/po/es/live-persistence.conf.5.po index 94c09a6..41d3c9d 100644 --- a/manpages/po/es/live-persistence.conf.5.po +++ b/manpages/po/es/live-persistence.conf.5.po @@ -4,12 +4,12 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a38-1\n" -"POT-Creation-Date: 2012-07-27 00:21+0300\n" +"Project-Id-Version: live-boot 3.0~b1-1\n" +"POT-Creation-Date: 2012-08-16 12:13+0300\n" "PO-Revision-Date: 2012-06-07 19:11+0200\n" "Last-Translator: Carlos Zuferri «chals» \n" -"Language-Team: none\n" -"Language: es\n" +"Language-Team: Debian Live \n" +"Language: Spanish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,14 +23,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-07-27" -msgstr "27.07.2012" +msgid "2012-08-16" +msgstr "16.08.2012" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a38-1" -msgstr "3.0~a38-1" +msgid "3.0~b1-1" +msgstr "3.0~b1-1" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 @@ -90,11 +90,6 @@ msgid "" "the homepage at EIE and in the manual at " "EIE." msgstr "" -"#-#-#-#-# live-boot.7.po (live-boot) #-#-#-#-#\n" -"Se puede encontrar más información acerca de live-boot y el proyecto Debian " -"Live en la página web EIE y en el manual en " -"EIE.\n" -"#-#-#-#-# live-persistence.conf.5.po (live-persistence.conf) #-#-#-#-#\n" "Se puede encontrar más información acerca de live-boot y el proyecto Debian " "Live en la página web EIE y en el manual en " "EIE." diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index ce3e428..69ccb54 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2012-07-27 00:21+0300\n" +"POT-Creation-Date: 2012-08-16 12:13+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-07-27" +msgid "2012-08-16" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a38-1" +msgid "3.0~b1-1" msgstr "" #. type: TH @@ -133,8 +133,8 @@ msgstr "" msgid "" "B can be configured (but not activated) through configuration " "files. Those files can be placed either in the root filesystem itself (/etc/" -"live/boot.conf, /etc/live/boot.d/*.conf), or on the live media (live/boot." -"conf, live/boot.d/*.conf)." +"live/boot.conf, /etc/live/boot/*), or on the live media (live/boot.conf, " +"live/boot/*)." msgstr "" #. type: SH @@ -822,7 +822,7 @@ msgstr "" #. type: IP #: en/live-boot.7:151 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: IP @@ -834,7 +834,7 @@ msgstr "" #. type: IP #: en/live-boot.7:153 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: IP diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot index 38b6190..0f1125e 100644 --- a/manpages/pot/live-persistence.conf.5.pot +++ b/manpages/pot/live-persistence.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2012-07-27 00:21+0300\n" +"POT-Creation-Date: 2012-08-16 12:13+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,13 +25,13 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "2012-07-27" +msgid "2012-08-16" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-persistence.conf.5:1 #, no-wrap -msgid "3.0~a38-1" +msgid "3.0~b1-1" msgstr "" #. type: TH diff --git a/scripts/boot.sh b/scripts/boot.sh index c031f00..11e8094 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -2,6 +2,16 @@ # set -e +# Reading configuration file from filesystem and live-media +for _FILE in /etc/live/boot.conf /etc/live/boot/* \ + /live/image/live/boot.conf /live/image/live/boot/* +do + if [ -e "${_FILE}" ] + then + . "${_FILE}" + fi +done + for _SCRIPT in /lib/live/boot/????-* do if [ -e "${_SCRIPT}" ] diff --git a/scripts/boot/0020-initramfs-tools b/scripts/boot/0020-initramfs-tools index 175488e..c251443 100755 --- a/scripts/boot/0020-initramfs-tools +++ b/scripts/boot/0020-initramfs-tools @@ -2,6 +2,11 @@ #set -e +if [ -e /scripts/functions ] +then + . /scripts/functions +fi + mountroot () { # initramfs-tools entry point for live-boot is mountroot(); function diff --git a/scripts/boot/0110-debug b/scripts/boot/0110-debug index a74dcb7..f223e93 100755 --- a/scripts/boot/0110-debug +++ b/scripts/boot/0110-debug @@ -13,10 +13,15 @@ Debug () esac done - if [ "${LIVE_DEBUG}" != "true" ] - then - return 0 - fi + case "${LIVE_DEBUG}" in + true) + ;; + *) + return 0 + ;; + esac + + # Write the trace output set -x } diff --git a/scripts/boot/0120-read-only b/scripts/boot/0120-read-only index c05c162..859f771 100755 --- a/scripts/boot/0120-read-only +++ b/scripts/boot/0120-read-only @@ -18,10 +18,14 @@ Read_only () esac done - if [ "${LIVE_READ_ONLY}" != "true" ] - then - return 0 - fi + case "${LIVE_READ_ONLY}" in + true) + ;; + + *) + return 0 + ;; + esac # Marking some block devices as read-only to ensure that nothing # gets written as linux still writes to 'only' read-only mounted filesystems. diff --git a/scripts/boot/3010-verify-checksums b/scripts/boot/3010-verify-checksums index 3649e04..8ccd663 100755 --- a/scripts/boot/3010-verify-checksums +++ b/scripts/boot/3010-verify-checksums @@ -18,10 +18,14 @@ Verify_checksums () esac done - if [ "${LIVE_VERIFY_CHECKSUMS}" != "true" ] - then - return 0 - fi + case "${LIVE_VERIFY_CHECKSUMS}" in + true) + ;; + + *) + return 0 + ;; + esac _MOUNTPOINT="${1}" diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon index 82e998a..7541c26 100755 --- a/scripts/boot/3020-swapon +++ b/scripts/boot/3020-swapon @@ -18,10 +18,14 @@ Swap () esac done - if [ "${LIVE_SWAP}" != "true" ] - then - return 0 - fi + case "${LIVE_SWAP}" in + true) + ;; + + *) + return 0 + ;; + esac LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}" diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh index 77a291a..6530cc1 100755 --- a/scripts/boot/9990-aaa-fixme.sh +++ b/scripts/boot/9990-aaa-fixme.sh @@ -1,11 +1,5 @@ #!/bin/sh -if [ -e /scripts/functions ] -then - # initramfs-tools specific (FIXME) - . /scripts/functions -fi - export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin" echo "/root/lib" >> /etc/ld.so.conf diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index 2cf1d7e..5732b2a 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -27,6 +27,11 @@ Main () Select_eth_device + if [ -e /conf/param.conf ] + then + . /conf/param.conf + fi + # Needed here too because some things (*cough* udev *cough*) # changes the timeout diff --git a/scripts/boot/9990-netbase.sh b/scripts/boot/9990-netbase.sh index c11b9df..64e30df 100755 --- a/scripts/boot/9990-netbase.sh +++ b/scripts/boot/9990-netbase.sh @@ -16,6 +16,7 @@ Netbase () log_begin_msg "Preconfiguring networking" IFFILE="/root/etc/network/interfaces" + DNSFILE="/root/etc/resolv.conf" if [ "${STATICIP}" = "frommedia" ] && [ -e "${IFFILE}" ] then @@ -43,6 +44,7 @@ EOF ifaddress="$(echo ${ifline} | cut -f2 -d ':')" ifnetmask="$(echo ${ifline} | cut -f3 -d ':')" ifgateway="$(echo ${ifline} | cut -f4 -d ':')" + nameserver="$(echo ${ifline} | cut -f5 -d ':')" cat >> "${IFFILE}" << EOF allow-hotplug ${ifname} @@ -60,6 +62,17 @@ cat >> "${IFFILE}" << EOF EOF fi + + if [ -n "${nameserver}" ] + then + if [ -e "${DNSFILE}" ] + then + grep -v ^nameserver "${DNSFILE}" > "${DNSFILE}.tmp" + mv "${DNSFILE}.tmp" "${DNSFILE}" + fi + + echo "nameserver ${nameserver}" >> "${DNSFILE}" + fi done else if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ] diff --git a/scripts/boot/9990-networking.sh b/scripts/boot/9990-networking.sh index 8c8d840..f32ae6c 100755 --- a/scripts/boot/9990-networking.sh +++ b/scripts/boot/9990-networking.sh @@ -110,7 +110,13 @@ do_netsetup () else for interface in ${DEVICE}; do ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config + + # squeeze [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf + + # wheezy + [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf + if [ "$IPV4ADDR" != "0.0.0.0" ] then break @@ -122,7 +128,13 @@ do_netsetup () do # source relevant ipconfig output OLDHOSTNAME=${HOSTNAME} + + # squeeze [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf + + # wheezy + [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf + [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME} export HOSTNAME diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index cb12c4b..597ff50 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -155,9 +155,8 @@ setup_unionfs () # tmpfs file systems touch /etc/fstab - mkdir -p /live - mount -t tmpfs tmpfs /live mkdir -p /live/overlay + mount -t tmpfs tmpfs /live/overlay # Looking for persistence devices or files if [ -n "${PERSISTENCE}" ] && [ -z "${NOPERSISTENCE}" ] @@ -344,6 +343,12 @@ setup_unionfs () # Correct the permissions of /: chmod 0755 "${rootmnt}" + # Correct the permission of /tmp: + if [ -d "${rootmnt}/tmp" ] + then + chmod 1777 "${rootmnt}"/tmp + fi + live_rofs_list="" # SHOWMOUNTS is necessary for custom mounts with the union option # Since we may want to do custom mounts in user-space it's best to always enable SHOWMOUNTS diff --git a/scripts/boot/README b/scripts/boot/README index 9ebce20..f3c62c5 100644 --- a/scripts/boot/README +++ b/scripts/boot/README @@ -1,4 +1,21 @@ -scripts overview +Note +---- + +live-boot is moving from a monolithic script into a proper +plugin architecture for better maintenance and customization. + +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 +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. + + +Scripts overview +---------------- 00xx initramfs "bootstrapping" @@ -9,3 +26,5 @@ scripts overview 2xxx find and mount persistence 3xxx anything after that involves read or write access to the rootfs + +9xxx FIXME -- 2.1.4