X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=5efe432f48c5941be9036a6a0ffc45d90d5d50dc;hb=274ce8e4e2b902e4e7b4871c284cee0285cf18a6;hp=d19b0d5b21afbf4e79947a4a1a9bcec3fc24f25d;hpb=1be87e2b9e51755ed766943f4c7f14de14db4b97;p=live-boot-grml.git

diff --git a/scripts/live-functions b/scripts/live-functions
index d19b0d5..5efe432 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -5,13 +5,11 @@
 log_wait_msg ()
 {
 	# Print a message and wait for enter
-	if [ -x /sbin/usplash_write ]
+	if [ -x /bin/plymouth ] && plymouth --ping
 	then
-		/sbin/usplash_write "INPUTENTER ${@}"
-		read nunya < /dev/.initramfs/usplash_outfifo
-	else if [ -x /sbin/splashy_update ] ; then
-		/sbin/splashy_update "getstring ${@}" | read nunya
-	fi ; fi
+		plymouth message --text="$@"
+		plymouth watch-keystroke | read nunya
+	fi
 
 	_log_msg "Waiting: ${@} ... \n"
 }
@@ -21,7 +19,7 @@ really_export ()
 	STRING="${1}"
 	VALUE="$(eval echo -n \${$STRING})"
 
-	if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}"
+	if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars
 	then
 		sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
 	else
@@ -35,7 +33,7 @@ lang2locale() {
 	langpart="${1%%_*}"
 	if [ "$1" != "C" ]; then
 		# Match the language code with 3rd field in languagelist
-		line=$(grep -v "^#" /root/usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+		line=$(grep -v "^#" /usr/share/live-boot/languagelist | cut -f1,3,6 -d\; | grep -v ';C$' | grep "^$langpart;")
 		if [ -n "$line" ]; then
 			if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
 				# More than one match; try matching the
@@ -92,7 +90,7 @@ panic() {
 	printf "     ${DEB_3}\n"
 	printf "     ${DEB_4}  This Debian Live image failed to boot.\n\n"
 
-	printf "  Please file a bug against the 'live-initramfs' package or email the Debian\n"
+	printf "  Please file a bug against the 'live-boot' package or email the Debian\n"
 	printf "  Live mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
 	printf "  exact version, name and distribution of the image you were attempting to boot.\n\n"
 
@@ -101,9 +99,9 @@ panic() {
 	printf "  extremely useful when diagnosing issues.\n\n"
 
 	if [ -n "${panic}" ]; then
-		printf "  live-initramfs will now restart your system. "
+		printf "  live-boot will now restart your system. "
 	else
-		printf "  live-initramfs will now start a shell. "
+		printf "  live-boot will now start a shell. "
 	fi
 	printf "The error message was:\n\n    "