[SCM] live-boot branch, debian-old-2.0, updated. debian/2.0.14-1-1-g4296fa3

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 4296fa3a89b696e9bbd4391ba9966c202c08269f
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 1 17:42:13 2011 +0100

    Adding live-system script from live-tools.

diff --git a/Makefile b/Makefile
index dae4ec1..d4aea51 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,9 @@ build:
 
 install:
 	# Installing executables
+	mkdir -p $(DESTDIR)/bin
+	cp bin/live-system $(DESTDIR)/bin
+
 	mkdir -p $(DESTDIR)/sbin
 	cp bin/live-new-uuid bin/live-snapshot bin/live-swapfile bin/live-toram $(DESTDIR)/sbin
 
@@ -77,7 +80,7 @@ install:
 
 uninstall:
 	# Uninstalling executables
-	rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile $(DESTDIR)/sbin/live-toram
+	rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile $(DESTDIR)/bin/live-system $(DESTDIR)/sbin/live-toram
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
 
 	rm -rf $(DESTDIR)/usr/share/live-boot
diff --git a/bin/live-system b/bin/live-system
new file mode 100755
index 0000000..026ab64
--- /dev/null
+++ b/bin/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-boot