# Reading configuration file from filesystem and live-media
for _FILE in /etc/live/boot.conf /etc/live/boot/* \
- /lib/live/image/live/boot.conf /lib/live/image/live/boot/*
+ /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
do
if [ -e "${_FILE}" ]
then
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 02.10.2012 3.0~b6\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 07.11.2012 3.0~b7\-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 02.10.2012 3.0~b6\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 07.11.2012 3.0~b7\-1 "Debian Live Project"
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
-.TH LIVE\-BOOT 7 2012\-10\-02 3.0~b6-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-11\-07 3.0~b7-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
-.TH LIVE\-BOOT conf 2012\-10\-02 3.0~b6-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-11\-07 3.0~b7-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 02.10.2012 3.0~b6\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 07.11.2012 3.0~b7\-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 02.10.2012 3.0~b6\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 07.11.2012 3.0~b7\-1 "Proyecto Debian Live"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b7-1\n"
+"POT-Creation-Date: 2012-11-07 15:04+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 "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-07"
+msgstr "07.11.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b7-1"
+msgstr "3.0~b7-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b7-1\n"
+"POT-Creation-Date: 2012-11-07 15:04+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 "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-07"
+msgstr "07.11.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b7-1"
+msgstr "3.0~b7-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b7-1\n"
+"POT-Creation-Date: 2012-11-07 15:04+0100\n"
"PO-Revision-Date: 2012-06-07 20:29+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 "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-07"
+msgstr "07.11.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b7-1"
+msgstr "3.0~b7-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b7-1\n"
+"POT-Creation-Date: 2012-11-07 15:04+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 "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-07"
+msgstr "07.11.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b7-1"
+msgstr "3.0~b7-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: 2012-10-02 10:38+0300\n"
+"POT-Creation-Date: 2012-11-07 15:04+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 "2012-10-02"
+msgid "2012-11-07"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "3.0~b6-1"
+msgid "3.0~b7-1"
msgstr ""
#. type: TH
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"POT-Creation-Date: 2012-11-07 15:04+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 "2012-10-02"
+msgid "2012-11-07"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "3.0~b6-1"
+msgid "3.0~b7-1"
msgstr ""
#. type: TH
echo "/root/lib" >> /etc/ld.so.conf
echo "/root/usr/lib" >> /etc/ld.so.conf
-mountpoint="/live/image"
+mountpoint="/live/medium"
alt_mountpoint="/media"
LIVE_MEDIA_PATH="live"
old_home_overlay_label="home-rw"
custom_overlay_label="persistence"
persistence_list="persistence.conf"
+old_persistence_list="live-persistence.conf"
if [ ! -f /live.vars ]
then
esac
# Move to the new root filesystem so that programs there can get at it.
- mkdir -p /root/lib/live/image
- mount --move /live/image /root/lib/live/image
+ mkdir -p /root/lib/live/mount/medium
+ mount --move /live/medium /root/lib/live/mount/medium
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
# Move findiso directory to the new root filesystem so that programs there can get at it.
if [ -d /live/findiso ]
then
- mkdir -p /root/lib/live/findiso
- mount -n --move /live/findiso /root/lib/live/findiso
+ mkdir -p /root/lib/live/mount/findiso
+ mount -n --move /live/findiso /root/lib/live/mount/findiso
fi
# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
then
losetup -d /dev/loop0
- if is_mountpoint /root/lib/live/findiso
+ if is_mountpoint /root/lib/live/mount/findiso
then
- umount /root/lib/live/findiso
- rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \
+ umount /root/lib/live/mount/findiso
+ rmdir --ignore-fail-on-non-empty /root/lib/live/mount/findiso \
>/dev/null 2>&1 || true
fi
fi
local white_listed_devices="${2}"
local ret=""
- local black_listed_devices="$(what_is_mounted_on /live/image)"
+ local black_listed_devices="$(what_is_mounted_on /live/medium)"
for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
do
continue
fi
- local include_list="${backing}/${persistence_list}"
- if [ ! -r "${include_list}" ]
+ local include_list
+ if [ -r "${backing}/${persistence_list}" ]
then
+ include_list="${backing}/${persistence_list}"
+ elif [ -r "${backing}/${old_persistence_list}" ]
+ then
+ include_list="${backing}/${old_persistence_list}"
+ else
continue
fi
do
if [ -d "/live/${_DIRECTORY}" ]
then
- mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}"
+ mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}"
for _MOUNT in $(ls /live/${_DIRECTORY})
do
- mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}"
- mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
- mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" || \
- log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}"
+ mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
+ mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \
+ mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" || \
+ log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}"
done
fi
done
- mkdir -p "${rootmnt}/lib/live/overlay"
- mount -o move /live/overlay "${rootmnt}/lib/live/overlay" > /dev/null 2>&1 || \
- mount -o bind /live/overlay "${rootmnt}/lib/live/overlay" || \
- log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/overlay"
+ mkdir -p "${rootmnt}/lib/live/mount/overlay"
+ mount -o move /live/overlay "${rootmnt}/lib/live/mount/overlay" > /dev/null 2>&1 || \
+ mount -o bind /live/overlay "${rootmnt}/lib/live/mount/overlay" || \
+ log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/mount/overlay"
# ensure that a potentially stray tmpfs gets removed
# otherways, initramfs-tools is unable to remove /live