X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=867d4f986514aefbd1b30be67e27451d28be3f84;hb=c16ef42462e2c9b0ee2a5f119bb3355f0ccf66d7;hp=46dcb745414bdbb330f4a092e0687f334e0c9952;hpb=f127af2237e3746cf50eab802c97d58e455127db;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 46dcb74..867d4f9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -154,6 +154,12 @@ Arguments ()
 				export LIVE_MEDIA_TIMEOUT
 				;;
 
+			language=*|debian-installer/language=*)
+				language=${x#debian-installer/language=}
+				locale="$(lang2locale "$language")"
+				set_locale="true"
+				;;
+
 			locale=*|debian-installer/locale=*)
 				LOCALE="${ARGUMENT#*=}"
 				export LOCALE
@@ -1205,7 +1211,7 @@ find_livefs ()
 	fi
 
 	# or do the scan of block devices
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-')
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-' | grep -v fd )
 	do
 		devname=$(sys2dev "${sysblock}")
 		fstype=$(get_fstype "${devname}")
@@ -1261,6 +1267,8 @@ mountroot ()
 	exec 7>&2
 	exec > live.log
 	exec 2>&1
+	tail -f live.log >&7 &
+	tailpid="${!}"
 
 	Arguments
 
@@ -1342,5 +1350,6 @@ mountroot ()
 
 	exec 1>&6 6>&-
 	exec 2>&7 7>&-
+	kill ${tailpid}
 	cp live.log "${rootmnt}/var/log/"
 }