[SCM] live-tools branch, upstream, updated. upstream/4.0_a1-1-g2a2059f
Daniel Baumann
daniel at debian.org
Thu Sep 27 10:47:06 UTC 2012
The following commit has been merged in the upstream branch:
commit 2a2059f6eecc5177652b15d7aaa2b5e592a96293
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Sep 27 12:46:59 2012 +0200
Adding upstream version 4.0~a2.
diff --git a/VERSION b/VERSION
index c3b296a..74e367d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a1-1
+4.0~a2-1
diff --git a/bin/live-system b/bin/live-system
index c12f3f0..ee550b3 100755
--- a/bin/live-system
+++ b/bin/live-system
@@ -51,9 +51,9 @@ if grep -qs "boot=live" /proc/cmdline
then
[ "${_VERBOSE}" ] && echo -n " yes, this is a debian-live based system"
- if [ -d /live/image/install ]
+ if [ -d /lib/live/image/install ]
then
- if ls /live/image/install/pool/main/l/live-installer/live-installer_*.udeb > /dev/null 2>&1
+ if ls /lib/live/image/install/pool/main/l/live-installer/live-installer_*.udeb > /dev/null 2>&1
then
[ "${_VERBOSE}" ] && echo " with debian-installer (live) support."
else
diff --git a/bin/live-toram b/bin/live-toram
index 3b2a473..ee3af2b 100755
--- a/bin/live-toram
+++ b/bin/live-toram
@@ -23,16 +23,16 @@ done
# Assemble filesystems
if [ -z "${_MODULE}" ]
then
- _FILESYSTEMS="/live/image/live/filesystem.squashfs"
+ _FILESYSTEMS="/lib/live/image/live/filesystem.squashfs"
else
for _FILESYSTEM in _MODULE
do
- _FILESYSTEMS="${_FILESYSTEMS} /live/image/live/${_FILESYSTEM}"
+ _FILESYSTEMS="${_FILESYSTEMS} /lib/live/image/live/${_FILESYSTEM}"
done
fi
# Exit if system is not debian-live based system
-if [ ! -d /live/image ]
+if [ ! -d /lib/live/image ]
then
echo "E: live-toram only works on Debian Live based systems."
@@ -109,12 +109,12 @@ EOF
done
# Unmounting live media
-_DEVICE="$(awk '/\/live\/image / { print $1 }' /proc/mounts)"
+_DEVICE="$(awk '/\/lib\/live\/image / { print $1 }' /proc/mounts)"
-if [ -d /live/image ]
+if [ -d /lib/live/image ]
then
- umount /live/image
- rmdir --ignore-fail-on-non-empty /live/image || true
+ umount /lib/live/image
+ rmdir --ignore-fail-on-non-empty /lib/live/image || true
fi
# Ejecting live media if it is not an optical device
diff --git a/bin/live-update-initramfs b/bin/live-update-initramfs
index b0adfb6..1d6fbf6 100755
--- a/bin/live-update-initramfs
+++ b/bin/live-update-initramfs
@@ -22,24 +22,24 @@ fi
if grep -qs "boot=live" /proc/cmdline
then
- if grep -qs "\/live\/image" /proc/mounts
+ if grep -qs "\/lib\/live\/image" /proc/mounts
then
- # live system with live media mounted as /live/image
- _DEVICE="$(awk '/\/live\/image/ { print $1 }' /proc/mounts)"
+ # live system with live media mounted as /lib/live/image
+ _DEVICE="$(awk '/\/lib\/live\/image/ { print $1 }' /proc/mounts)"
mount -o remount,rw ${_DEVICE} > /dev/null 2>&1 || true
- if touch /live/image/.test > /dev/null 2>&1
+ if touch /lib/live/image/.test > /dev/null 2>&1
then
_READ_WRITE="true"
- rm -f /live/image/.test
+ rm -f /lib/live/image/.test
else
_READ_WRITE="false"
fi
else
- # live system without live media mounted as /live/image
- echo "I: update-initramfs is disabled (live system is running without media mounted on /live/image)."
+ # live system without live media mounted as /lib/live/image
+ echo "I: update-initramfs is disabled (live system is running without media mounted on /lib/live/image)."
exit 0
fi
@@ -64,20 +64,20 @@ case "${_READ_WRITE}" in
do
_VERSION="$(echo ${_INITRD} | sed -e 's|initrd.img-||')"
- cp /boot/vmlinuz-${_VERSION} /live/image/live/vmlinuz${_NUMBER}.new
- cp /boot/initrd.img-${_VERSION} /live/image/live/initrd${_NUMBER}.img.new
+ cp /boot/vmlinuz-${_VERSION} /lib/live/image/live/vmlinuz${_NUMBER}.new
+ cp /boot/initrd.img-${_VERSION} /lib/live/image/live/initrd${_NUMBER}.img.new
- mv /live/image/live/vmlinuz${_NUMBER}.new /live/image/live/vmlinuz${_NUMBER}
- mv /live/image/live/initrd${_NUMBER}.img.new /live/image/live/initrd${_NUMBER}.img
+ mv /lib/live/image/live/vmlinuz${_NUMBER}.new /lib/live/image/live/vmlinuz${_NUMBER}
+ mv /lib/live/image/live/initrd${_NUMBER}.img.new /lib/live/image/live/initrd${_NUMBER}.img
_NUMBER="$((${_NUMBER} + 1))"
done
else
- cp /boot/vmlinuz-* /live/image/live/vmlinuz.new
- cp /boot/initrd.img-* /live/image/live/initrd.img.new
+ cp /boot/vmlinuz-* /lib/live/image/live/vmlinuz.new
+ cp /boot/initrd.img-* /lib/live/image/live/initrd.img.new
- mv /live/image/live/vmlinuz.new /live/image/live/vmlinuz
- mv /live/image/live/initrd.img.new /live/image/live/initrd.img
+ mv /lib/live/image/live/vmlinuz.new /lib/live/image/live/vmlinuz
+ mv /lib/live/image/live/initrd.img.new /lib/live/image/live/initrd.img
fi
;;
diff --git a/manpages/ca/live-tools.ca.7 b/manpages/ca/live-tools.ca.7
index 5e6f447..c1e44db 100644
--- a/manpages/ca/live-tools.ca.7
+++ b/manpages/ca/live-tools.ca.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 26.09.2012 4.0~a1\-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 27.09.2012 4.0~a2\-1 "Debian Live Project"
.SH NOM
\fBlive\-tools\fP \- Scripts de Suport del Sistema
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index c4f526c..f32e26e 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 26.09.2012 4.0~a1\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 27.09.2012 4.0~a2\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-tools\fP \- System Support Skripte
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index 4d5a792..4bd0a87 100644
--- a/manpages/en/live-tools.7
+++ b/manpages/en/live-tools.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-TOOLS 7 2012\-09\-26 4.0~a1-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-09\-27 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlive\-tools\fR \- System Support Scripts
diff --git a/manpages/es/live-tools.es.7 b/manpages/es/live-tools.es.7
index b0dc7e4..fc0203a 100644
--- a/manpages/es/live-tools.es.7
+++ b/manpages/es/live-tools.es.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 26.09.2012 4.0~a1\-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 27.09.2012 4.0~a2\-1 "Debian Live Project"
.SH NOMBRE
\fBlive\-tools\fP \- Scripts de Apoyo del Sistema
diff --git a/manpages/fr/live-tools.fr.7 b/manpages/fr/live-tools.fr.7
index 2fa0e5b..9e83349 100644
--- a/manpages/fr/live-tools.fr.7
+++ b/manpages/fr/live-tools.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 26.09.2012 4.0~a1\-1 "Projet Debian Live"
+.TH LIVE\-TOOLS 7 27.09.2012 4.0~a2\-1 "Projet Debian Live"
.SH NOM
\fBlive\-tools\fP \- Scripts de Support du Système
diff --git a/manpages/po/ca/live-tools.7.po b/manpages/po/ca/live-tools.7.po
index e18f176..945aab4 100644
--- a/manpages/po/ca/live-tools.7.po
+++ b/manpages/po/ca/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 4.0~a1-1\n"
-"POT-Creation-Date: 2012-09-26 14:51+0300\n"
+"Project-Id-Version: live-tools 4.0~a2-1\n"
+"POT-Creation-Date: 2012-09-27 12:41+0300\n"
"PO-Revision-Date: 2012-07-29 23:39+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-09-26"
-msgstr "26.09.2012"
+msgid "2012-09-27"
+msgstr "27.09.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index c48e578..f57397b 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 4.0~a1-1\n"
-"POT-Creation-Date: 2012-09-26 14:51+0300\n"
+"Project-Id-Version: live-tools 4.0~a2-1\n"
+"POT-Creation-Date: 2012-09-27 12:41+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-09-26"
-msgstr "26.09.2012"
+msgid "2012-09-27"
+msgstr "27.09.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/po/es/live-tools.7.po b/manpages/po/es/live-tools.7.po
index eb8aa23..6b40ea7 100644
--- a/manpages/po/es/live-tools.7.po
+++ b/manpages/po/es/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 4.0~a1-1\n"
-"POT-Creation-Date: 2012-09-26 14:51+0300\n"
+"Project-Id-Version: live-tools 4.0~a2-1\n"
+"POT-Creation-Date: 2012-09-27 12:41+0300\n"
"PO-Revision-Date: 2012-07-28 22:44+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-09-26"
-msgstr "26.09.2012"
+msgid "2012-09-27"
+msgstr "27.09.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/po/fr/live-tools.7.po b/manpages/po/fr/live-tools.7.po
index bb485bc..d52e10b 100644
--- a/manpages/po/fr/live-tools.7.po
+++ b/manpages/po/fr/live-tools.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 4.0~a1-1\n"
-"POT-Creation-Date: 2012-09-26 14:51+0300\n"
+"Project-Id-Version: live-tools 4.0~a2-1\n"
+"POT-Creation-Date: 2012-09-27 12:41+0300\n"
"PO-Revision-Date: 2012-07-31 00:29+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-09-26"
-msgstr "26.09.2012"
+msgid "2012-09-27"
+msgstr "27.09.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 6db7a66..e3ba692 100644
--- a/manpages/pot/live-tools.7.pot
+++ b/manpages/pot/live-tools.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:51+0300\n"
+"POT-Creation-Date: 2012-09-27 12:41+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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-09-26"
+msgid "2012-09-27"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "4.0~a1-1"
+msgid "4.0~a2-1"
msgstr ""
#. type: TH
--
live-tools
More information about the debian-live-changes
mailing list