[SCM] live-tools branch, upstream, updated. upstream/3.0_a7-1-g2aeeb6d
Daniel Baumann
daniel at debian.org
Fri Apr 6 11:48:23 UTC 2012
The following commit has been merged in the upstream branch:
commit 2aeeb6d588d5bc19861699ccc0f0696742622212
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Apr 6 13:47:21 2012 +0200
Adding upstream version 3.0~b1.
diff --git a/VERSION b/VERSION
index 71373e8..cd57b67 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a7-1
+3.0~b1-1
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index 5421ec7..0c921e5 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 03.18.2012 3.0~a7\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 06.04.2012 3.0~b1\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-tools\fP \- System Support Skripte
@@ -25,7 +25,7 @@
.IP \fBlive\-toram\fP 4
kopiert das laufende System in RAM um das Live Medium auszuwerfen.
.IP \fBlive\-system\fP 4
-bestimmt ob das laufende System ein Live System ist.
+bestimmt ob das laufende System ein Debian Live basiertes System ist.
.SH "SIEHE AUCH"
\fIlive\-boot\fP(7)
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index a9cd0ec..178f286 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\-03\-18 3.0~a7-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-04\-06 3.0~b1-1 "Debian Live Project"
.SH NAME
\fBlive\-tools\fR \- System Support Scripts
@@ -20,7 +20,7 @@
.IP "\fBlive\-toram\fR" 4
copies running system to RAM in order to eject the live media.
.IP "\fBlive\-system\fR" 4
-determines if running system is a live system.
+determines if running system is a debian-live based system.
.SH SEE ALSO
\fIlive\-boot\fR(7)
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index 8455088..f398bf8 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -1,11 +1,11 @@
# German translations for live-tools package
-# 2010 Daniel Baumann <daniel at debian.org>
+# 2006-2012 Daniel Baumann <daniel at debian.org>
# This file is distributed under the same license as the live-tools package.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 3.0~a5\n"
-"POT-Creation-Date: 2012-03-18 14:46+0100\n"
+"Project-Id-Version: live-tools 3.0~b1\n"
+"POT-Creation-Date: 2012-04-06 13:44+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-03-18"
-msgstr "03.18.2012"
+msgid "2012-04-06"
+msgstr "06.04.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0~a7-1"
-msgstr "3.0~a7-1"
+msgid "3.0~b1-1"
+msgstr "3.0~b1-1"
#. type: TH
#: en/live-tools.7:9
@@ -92,8 +92,8 @@ msgstr "B<live-system>"
#. type: Plain text
#: en/live-tools.7:24
-msgid "determines if running system is a live system."
-msgstr "bestimmt ob das laufende System ein Live System ist."
+msgid "determines if running system is a debian-live based system."
+msgstr "bestimmt ob das laufende System ein Debian Live basiertes System ist."
#. type: SH
#: en/live-tools.7:25
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 15bf117..2197892 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-03-18 14:46+0100\n"
+"POT-Creation-Date: 2012-04-06 13:44+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-03-18"
+msgid "2012-04-06"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0~a7-1"
+msgid "3.0~b1-1"
msgstr ""
#. type: TH
@@ -93,7 +93,7 @@ msgstr ""
#. type: Plain text
#: en/live-tools.7:24
-msgid "determines if running system is a live system."
+msgid "determines if running system is a debian-live based system."
msgstr ""
#. type: SH
diff --git a/scripts/live-system b/scripts/live-system
index bf35357..c12f3f0 100755
--- a/scripts/live-system
+++ b/scripts/live-system
@@ -25,7 +25,7 @@ exec 1>&2
case "${1}" in
-h|--help|-u|--usage)
- echo "live-system - determine if running system is a live system"
+ echo "live-system - determine if running system is a debian-live based system"
echo
echo "Usage: ${0} [-v|--verbose]"
@@ -37,33 +37,35 @@ case "${1}" in
;;
esac
-[ "${_VERBOSE}" ] && echo -n "Checking for live-system... "
+[ "${_VERBOSE}" ] && echo -n "Checking for debian-live based system..."
if [ ! -e /proc/cmdline ]
then
+ [ "${_VERBOSE}" ] && echo
echo "E: /proc/cmdline - No such file."
+
exit 2
fi
-if grep -qs boot=live /proc/cmdline
+if grep -qs "boot=live" /proc/cmdline
then
- [ "${_VERBOSE}" ] && echo -n " yes, this is a live system"
+ [ "${_VERBOSE}" ] && echo -n " yes, this is a debian-live based system"
if [ -d /live/image/install ]
then
if ls /live/image/install/pool/main/l/live-installer/live-installer_*.udeb > /dev/null 2>&1
then
- [ "${_VERBOSE}" ] && echo " with live-installer support."
+ [ "${_VERBOSE}" ] && echo " with debian-installer (live) support."
else
- [ "${_VERBOSE}" ] && echo " without live-installer support."
+ [ "${_VERBOSE}" ] && echo " with debian-installer (normal) support."
fi
else
- [ "${_VERBOSE}" ] && echo "without installer support."
+ [ "${_VERBOSE}" ] && echo "without debian-installer support."
fi
exit 0
else
- [ "${_VERBOSE}" ] && echo " no, this is not a live system."
+ [ "${_VERBOSE}" ] && echo " no, this is not a debian-live based system."
exit 1
fi
diff --git a/scripts/live-toram b/scripts/live-toram
index f1ec8b8..f6995ad 100755
--- a/scripts/live-toram
+++ b/scripts/live-toram
@@ -31,10 +31,10 @@ else
done
fi
-# Exit if system is not debian live
+# Exit if system is not debian-live based system
if [ ! -d /live/image ]
then
- echo "E: live-toram only works on Debian Live systems."
+ echo "E: live-toram only works on Debian Live based systems."
exit 1
fi
@@ -70,7 +70,7 @@ done
case ${@} in
-f|--force)
- echo "W: Ignoring memory constrains as requested"
+ echo "I: Ignoring memory constrains as requested"
;;
*)
@@ -86,12 +86,12 @@ esac
# Copying image to memory
echo "P: Copying images to memory."
-echo "P: This may take a while..."
+echo "I: This may take a while..."
# FIXME: doesn't work with multiple filesystems
for _FILESYSTEM in ${_FILESYSTEMS}
do
- if [ ! -x "$(which rsync 2>/dev/null)" ]
+ if [ ! -x "$(which rsync 2> /dev/null)" ]
then
rsync -a --progress ${_FILESYSTEM} /tmp/live
else
@@ -121,8 +121,8 @@ fi
if [ "$(expr substr ${_DEVICE} 1 2)" != "sd" ] && \
! readlink /sys/block/$(expr substr ${_DEVICE} 6 3) | grep -q usb
then
- if [ ! -x "$(which rsync 2>/dev/null)" ]
+ if [ ! -x "$(which eject 2> /dev/null)" ]
then
- eject -p -m ${_DEVICE} >/dev/null 2>&1
+ eject -p -m ${_DEVICE} > /dev/null 2>&1
fi
fi
--
live-tools
More information about the debian-live-changes
mailing list