[SCM] live-boot branch, debian-next, updated. debian/3.0_a26-1-10-g01c5591
Daniel Baumann
daniel at debian.org
Sun Apr 8 17:53:48 UTC 2012
The following commit has been merged in the debian-next branch:
commit b5678340476350707c088253fe5ceee2dccda096
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Apr 8 17:47:57 2012 +0200
Renaming /live/cow to /live/overlay in anticipation of overlayfs.
diff --git a/bin/live-snapshot b/bin/live-snapshot
index ca495fb..c9de008 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -3,7 +3,7 @@
# live-snapshot - utility to manage Debian Live systems snapshots
#
# This program mounts a device (fallback to /tmpfs under $MOUNTP
-# and saves the /live/cow (or a different directory) filesystem in it
+# and saves the /live/overlway (or a different directory) filesystem in it
# for reuse in another live-boot session.
# Look at the manpage for more informations.
#
@@ -57,7 +57,7 @@ SAFE_TMPDIR="/live"
# Permits multiple runs
MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)"
DEST="${MOUNTP}/live-sn.cpio.gz"
-DEF_SNAP_COW="/live/cow"
+DEF_SNAP_COW="/live/overlay"
TMP_FILELIST="${PROGRAM}.list"
# Command line defaults and declarations
@@ -365,7 +365,7 @@ Do_filelist ()
if [ -f "${SNAP_LIST}" ]
then
- # if SNAP_COW == /live/cow/home, SNAP_RW = /home
+ # if SNAP_COW == /live/overlay/home, SNAP_RW = /home
SNAP_RW=$(echo "${SNAP_COW}" | sed -e "s|${DEF_SNAP_COW}||g")
if [ -z "${SNAP_RW}" ]
then
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index ad922e5..3268b42 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -257,7 +257,7 @@ carriage\-return\-separated file names corresponding to disk images in the
merged into the root aufs, and they will be loaded in the order listed
here. The first entry in this file will be the "lowest" point in the aufs,
and the last file in this list will be on the "top" of the aufs, directly
-below /cow. Without this file, any images in the "/live" directory are
+below /overlay. Without this file, any images in the "/live" directory are
loaded in alphanumeric order.
.IP \fB/etc/live\-persistence.binds\fP 4
This optional file (which resides in the rootfs system, not in the live
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 57b833a..3661451 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -28,8 +28,8 @@ by the live\-boot init script to resync the boot\-found snapshots devices.
.SH OPTIONS
.IP "\-c, \-\-cow \fIDIRECTORY\fP" 4
specifies the input directory to be cloned in the image file. Its default
-value "/live/cow" should be right for most uses. However it could be handy
-to specify "/home" and type ext4 for the type to prepare an image file
+value "/live/overlay" should be right for most uses. However it could be
+handy to specify "/home" and type ext4 for the type to prepare an image file
suited to be directly mounted by live\-boot as home.
.IP "\-d, \-\-device \fIDEVICE\fP" 4
sets the device where the media which the snapshot/persistence
@@ -71,7 +71,7 @@ carriage\-return\-separated file names corresponding to disk images in the
merged into the root aufs, and they will be loaded in the order listed
here. The first entry in this file will be the "lowest" point in the aufs,
and the last file in this list will be on the "top" of the aufs, directly
-below /cow. Without this file, any images in the "/live" directory are
+below /overlay. Without this file, any images in the "/live" directory are
loaded in alphanumeric order.
.IP \fB/etc/live\-persistence.binds\fP 4
This optional file (which resides in the rootfs system, not in the live
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index ed66ad7..32f1108 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -141,7 +141,7 @@ By default, live\-boot uses aufs. With this parameter, you can switch to unionfs
.IP "\fB/etc/live.conf\fR" 4
Some variables can be configured via this config file (inside the live system).
.IP "\fBlive/filesystem.module\fR" 4
-This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /cow. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
+This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
.IP "\fB/etc/live\-persistence.binds\fR" 4
This optional file (which resides in the rootfs system, not in the live media) is used as a list of directories which not need be persistent: ie. their content does not need to survive reboots when using the persistence features.
.br
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 72a08dd..cefa015 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -19,7 +19,7 @@ live\-snapshot is a script which can be used to build the right types of persist
.SH OPTIONS
.IP "\-c, \-\-cow \fIDIRECTORY\fR" 4
-specifies the input directory to be cloned in the image file. Its default value "/live/cow" should be right for most uses. However it could be handy to specify "/home" and type ext4 for the type to prepare an image file suited to be directly mounted by live\-boot as home.
+specifies the input directory to be cloned in the image file. Its default value "/live/overlay" should be right for most uses. However it could be handy to specify "/home" and type ext4 for the type to prepare an image file suited to be directly mounted by live\-boot as home.
.IP "\-d, \-\-device \fIDEVICE\fR" 4
sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext4 fs will be automatically created and labelled according to the values specified after the "\-\-output" value or with a sane default.
.IP "\-e, \-\-exclude\-list \fIFILE\fR" 4
@@ -43,7 +43,7 @@ output version information and exit.
.IP "\fB/etc/live.conf\fR" 4
Some variables can be configured via this config file (inside the live system).
.IP "\fBlive/filesystem.module\fR" 4
-This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /cow. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
+This optional file (inside the live media) contains a list of white\-space or carriage\-return\-separated file names corresponding to disk images in the "/live" directory. If this file exists, only images listed here will be merged into the root aufs, and they will be loaded in the order listed here. The first entry in this file will be the "lowest" point in the aufs, and the last file in this list will be on the "top" of the aufs, directly below /overlay. Without this file, any images in the "/live" directory are loaded in alphanumeric order.
.IP "\fB/etc/live\-persistence.binds\fR" 4
This optional file (which resides in the rootfs system, not in the live media) is used as a list of directories which not need be persistent: ie. their content does not need to survive reboots when using the persistence features.
.br
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index f5ef46c..bcb449e 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a26\n"
-"POT-Creation-Date: 2012-04-08 12:28+0300\n"
+"POT-Creation-Date: 2012-04-08 18:00+0300\n"
"PO-Revision-Date: 2012-04-05 08:11+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -796,8 +796,8 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 116f878..381699d 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a26-1\n"
-"POT-Creation-Date: 2012-04-08 12:28+0300\n"
+"POT-Creation-Date: 2012-04-08 18:00+0300\n"
"PO-Revision-Date: 2012-04-05 08:11+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -85,8 +85,8 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
@@ -238,9 +238,9 @@ msgstr ""
#: en/live-snapshot.1:23
msgid ""
"specifies the input directory to be cloned in the image file. Its default "
-"value \"/live/cow\" should be right for most uses. However it could be handy "
-"to specify \"/home\" and type ext4 for the type to prepare an image file "
-"suited to be directly mounted by live-boot as home."
+"value \"/live/overlay\" should be right for most uses. However it could be "
+"handy to specify \"/home\" and type ext4 for the type to prepare an image "
+"file suited to be directly mounted by live-boot as home."
msgstr ""
#. type: IP
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 6540f59..72a0795 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-04-08 12:28+0300\n"
+"POT-Creation-Date: 2012-04-08 18:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -797,8 +797,8 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 133bd0c..b9485be 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:28+0300\n"
+"POT-Creation-Date: 2012-04-08 18:00+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -86,8 +86,8 @@ msgid ""
"merged into the root aufs, and they will be loaded in the order listed here. "
"The first entry in this file will be the \"lowest\" point in the aufs, and "
"the last file in this list will be on the \"top\" of the aufs, directly "
-"below /cow. Without this file, any images in the \"/live\" directory are "
-"loaded in alphanumeric order."
+"below /overlay. Without this file, any images in the \"/live\" directory "
+"are loaded in alphanumeric order."
msgstr ""
#. type: IP
@@ -239,9 +239,9 @@ msgstr ""
#: en/live-snapshot.1:23
msgid ""
"specifies the input directory to be cloned in the image file. Its default "
-"value \"/live/cow\" should be right for most uses. However it could be handy "
-"to specify \"/home\" and type ext4 for the type to prepare an image file "
-"suited to be directly mounted by live-boot as home."
+"value \"/live/overlay\" should be right for most uses. However it could be "
+"handy to specify \"/home\" and type ext4 for the type to prepare an image "
+"file suited to be directly mounted by live-boot as home."
msgstr ""
#. type: IP
diff --git a/scripts/live b/scripts/live
index 14165c1..62f7df5 100755
--- a/scripts/live
+++ b/scripts/live
@@ -952,7 +952,7 @@ setup_unionfs ()
log_end_msg
fi
- mkdir -p /cow
+ mkdir -p /overlay
# Looking for persistent devices or files
if [ -n "${PERSISTENT}" ] && [ -z "${NOPERSISTENT}" ]
@@ -1106,11 +1106,11 @@ setup_unionfs ()
then
if [ -n "${PERSISTENT_READONLY}" ]
then
- mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/cow"
+ mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/overlay"
root_backing="${rootmnt}/live/persistent/$(basename ${cowdevice})-root"
mkdir -p ${root_backing}
else
- root_backing="/cow"
+ root_backing="/overlay"
fi
if [ "${cow_fstype}" = "nfs" ]
@@ -1164,7 +1164,7 @@ setup_unionfs ()
unionmountopts="-t ${cow_fstype} -o noatime,union,${cow_mountopt} ${cowdevice}"
mount_full $unionmountopts "${unionmountpoint}"
else
- cow_dir="/cow${dir}"
+ cow_dir="/overlay${dir}"
rofs_dir="${rofs}${dir}"
mkdir -p ${cow_dir}
if [ -n "${PERSISTENT_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
@@ -1245,9 +1245,9 @@ setup_unionfs ()
try_snap "${home_snapdata}" "${rootmnt}" "HOME" "/home"
fi
- # shows cow fs on /cow for use by live-snapshot
- mkdir -p "${rootmnt}/live/cow"
- mount -o move /cow "${rootmnt}/live/cow" >/dev/null 2>&1 || mount -o bind /cow "${rootmnt}/live/cow" || log_warning_msg "Unable to move or bind /cow to ${rootmnt}/live/cow"
+ # shows cow fs on /overlay for use by live-snapshot
+ mkdir -p "${rootmnt}/live/overlay"
+ mount -o move /overlay "${rootmnt}/live/overlay" >/dev/null 2>&1 || mount -o bind /overlay "${rootmnt}/live/overlay" || log_warning_msg "Unable to move or bind /overlay to ${rootmnt}/live/overlay"
}
check_dev ()
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 889d157..9fea5a6 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -188,8 +188,8 @@ Arguments ()
export NFSOPTS
;;
- nfscow=*)
- NFS_COW="${ARGUMENT#nfscow=}"
+ nfsoverlay=*)
+ NFS_COW="${ARGUMENT#nfsoverlay=}"
export NFS_COW
;;
@@ -1502,11 +1502,11 @@ activate_custom_mounts ()
# be linked, causing breakage.
if [ -n "${rootmnt}" ]
then
- local cow_dir="/cow/live/persistent/$(basename ${links_source})"
+ local cow_dir="/overlay/live/persistent/$(basename ${links_source})"
else
# This is happens if persistence is activated
# post boot
- local cow_dir="/live/cow/live/persistent/$(basename ${links_source})"
+ local cow_dir="/live/overlay/live/persistent/$(basename ${links_source})"
fi
mkdir -p ${cow_dir}
chown_ref "${source}" "${cow_dir}"
@@ -1526,11 +1526,11 @@ activate_custom_mounts ()
# is non-empty (and necessary) only for unions
if [ -n "${rootmnt}" ]
then
- local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/cow/|")"
+ local cow_dir="$(echo ${dest} | sed -e "s|^${rootmnt}|/overlay/|")"
else
# This is happens if persistence is activated
# post boot
- local cow_dir="/live/cow/${dest}"
+ local cow_dir="/live/overlay/${dest}"
fi
if [ -e "${cow_dir}" ] && [ -z "${opt_linkfiles}" ]
then
--
live-boot
More information about the debian-live-changes
mailing list