[SCM] live-tools branch, upstream, updated. upstream/3.0_a1-1-g75f5203

[Daniel Baumann]

The following commit has been merged in the upstream branch:
commit 75f5203f05ef3aa70f09282623cde7023e88e710
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 6 15:21:16 2010 +0100

    Adding upstream version 3.0~a2.

diff --git a/Makefile b/Makefile
index e7292de..ededfca 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ LANGUAGES = de
 
 SCRIPTS = scripts/*
 
-all: test build
+all: build
 
 test:
 	@echo -n "Checking for syntax errors"
diff --git a/VERSION b/VERSION
index cfb3a5a..3ccf2a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a1
+3.0~a2
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index deaa8d2..e55e61e 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 02.09.2010 3.0~a1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 06.12.2010 3.0~a2 "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 b1839bd..b43e91a 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 2010\-09\-02 3.0~a1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2010\-12\-06 3.0~a2 "Debian Live Project"
 
 .SH NAME
 \fBlive\-tools\fR \- System Support Scripts
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index 577132c..e4fbe3f 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 3.0~a1\n"
-"POT-Creation-Date: 2010-09-02 18:11+0300\n"
+"Project-Id-Version: live-tools 3.0~a2\n"
+"POT-Creation-Date: 2010-12-06 15:19+0100\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 "2010-09-02"
-msgstr "02.09.2010"
+msgid "2010-12-06"
+msgstr "06.12.2010"
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a1"
-msgstr "3.0~a1"
+msgid "3.0~a2"
+msgstr "3.0~a2"
 
 #. type: TH
 #: en/live-tools.7:9
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 910ab11..ba84035 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: 2010-09-02 18:11+0300\n"
+"POT-Creation-Date: 2010-12-06 15:19+0100\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 "2010-09-02"
+msgid "2010-12-06"
 msgstr ""
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a1"
+msgid "3.0~a2"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/live-system b/scripts/live-system
new file mode 100755
index 0000000..026ab64
--- /dev/null
+++ b/scripts/live-system
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Redirect stdout to stderr
+exec 1>&2
+
+case "${1}" in
+	-h|--help|-u|--usage)
+		echo "live-system - determine if running system is a live system"
+		echo
+		echo "Usage: ${0} [-v|--verbose]"
+
+		exit 2
+		;;
+
+	-v|--verbose)
+		_VERBOSE="true"
+		;;
+esac
+
+[ "${_VERBOSE}" ] && echo -n "Checking for live-system... "
+
+if [ ! -e /proc/cmdline ]
+then
+	echo "E: /proc/cmdline - No such file."
+	exit 2
+fi
+
+if grep -qs boot=live /proc/cmdline
+then
+	[ "${_VERBOSE}" ] && echo -n " yes, this is a live 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."
+		else
+			[ "${_VERBOSE}" ] && echo " without live-installer support."
+		fi
+	else
+		[ "${_VERBOSE}" ] && echo "without installer support."
+	fi
+
+	exit 0
+else
+	[ "${_VERBOSE}" ] && echo " no, this is not a live system."
+
+	exit 1
+fi

-- 
live-tools