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"; \
#set -e
+. /lib/live/boot.sh
+
DRACUT_FIXME ()
{
# dracut entry point for live-boot is FIXME(); function
copy_exec "${FILE}"
done
-# wheezy/sid
if [ -e /lib/udev/rules.d/60-cdrom_id.rules ]
then
mkdir -p ${DESTDIR}/lib/udev/rules.d
[ "${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 ]
#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
+}
@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"; \
.\" 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
.\" 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
-.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
-.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
.\" 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
.\" 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
#
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 <daniel@debian.org>\n"
"Language-Team: none\n"
#. 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
#
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 <daniel@debian.org>\n"
"Language-Team: none\n"
#. 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
#
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 <chals@altorricon.com>\n"
"Language-Team: none\n"
#. 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
#
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» <chals@altorricon.com>\n"
"Language-Team: none\n"
#. 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
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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. 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
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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. 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
+++ /dev/null
-#!/bin/sh
-
-#set -e
-
-if [ -e /scripts/functions ]
-then
- . /scripts/functions
-fi
-
-mountroot ()
-{
- # initramfs-tools entry point for live-boot is mountroot(); function
- Main
-}
# 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
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}"
# 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
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
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}
# 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
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.
Scripts overview
----------------
-00xx initramfs "bootstrapping"
-
0xxx live-boot internals
1xxx find and mount rootfs