From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 18:41:45 +0000 (+0200)
Subject: Adding upstream version 1.110.5.
X-Git-Tag: upstream/1.110.5^0
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=baa2ce2723e1b7925b596d3fc12a62e8a99e2cb4;p=live-boot-grml.git

Adding upstream version 1.110.5.
---

diff --git a/Makefile b/Makefile
index 347d449..ab5403f 100644
--- a/Makefile
+++ b/Makefile
@@ -104,10 +104,10 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-10\\-29/2007\\-11\\-05/' \
-			-e 's/2007-10-29/2007-11-05/' \
-			-e 's/29.10.2007/05.11.2007/' \
-			-e 's/1.110.4/1.110.5/' \
+		sed -i	-e 's/2007\\-11\\-05/2007\\-11\\-12/' \
+			-e 's/2007-11-05/2007-11-12/' \
+			-e 's/05.11.2007/12.11.2007/' \
+			-e 's/1.110.5/1.110.6/' \
 		$$FILE; \
 	done
 
diff --git a/scripts/live b/scripts/live
index 1dcbc74..9fff065 100755
--- a/scripts/live
+++ b/scripts/live
@@ -507,13 +507,16 @@ mount_images_in_directory ()
 {
 	directory="${1}"
 	rootmnt="${2}"
+    	mac="${3}"
+
 
 	if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" ||
 		match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir"
 	then
-		setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}"
+		[ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}"
+		setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}"
 	else
 		:
 	fi
@@ -869,7 +872,7 @@ setup_unionfs ()
 {
 	image_directory="${1}"
 	rootmnt="${2}"
-
+        addimage_directory="${3}"
 	modprobe -q -b ${UNIONTYPE}
 
 	# run-init can't deal with images in a subdir, but we're going to
@@ -918,6 +921,20 @@ setup_unionfs ()
 			done
 		done
 
+		if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ]
+		then
+			for FILESYSTEM in squashfs ext2 ext3 xfs dir
+			do
+				for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}"
+				do
+					if [ -e "${IMAGE}" ]
+					then
+						image_string="${image_string} ${IMAGE}"
+					fi
+				done
+			done
+		fi
+
 		# Now sort the list
 		image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )"
 	fi
@@ -978,7 +995,7 @@ setup_unionfs ()
 			nfs_cow_opts="-o nolock"
 			nfs_cow=${NFS_COW}
 		fi
-		mac=$(get_mac)
+		mac="$(get_mac)"
 		if [ -n "${mac}" ]
 		then
 			cowdevice=$(echo ${nfs_cow}|sed "s/client_mac_address/${mac}/")
@@ -1262,7 +1279,9 @@ mountroot ()
 	then
 		setup_unionfs "${livefs_root}" "${rootmnt}"
 	else
-		mount_images_in_directory "${livefs_root}" "${rootmnt}"
+		mac="$(get_mac)"
+		mac="$(echo ${mac} | sed 's/-//g')"
+		mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
 	fi
 
 	log_end_msg
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 3653e1b..3cb58dd 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -79,6 +79,20 @@ then
 
 	LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q)
 
+	language="${LANG%%.UTF-8*}"
+	if [ -d /root/etc/default/kdm.d/ ]
+	then
+
+cat > /root/etc/default/kdm.d/live-autologin << EOF
+LANGUAGE=${language}
+EOF
+
+	elif [ -f /root/etc/kde3/kdm/kdmrc ]
+	then
+		sed -i -r -e "s/#Language=.*/Language=${language}/" \
+			/root/etc/kde3/kdm/kdmrc
+	fi
+
 	if [ -z "${LANG}" ]
 	then
 		log_warning_message "Locale ${locale} is unsupported."
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 03b66f4..10cae2d 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -55,7 +55,16 @@ then
 	${GDMCONF}
 fi
 
-if [ -f /root/etc/kde3/kdm/kdmrc ]
+if [ -d /root/etc/default/kdm.d/ ]
+then
+
+cat >> /root/etc/default/kdm.d/live-autologin << EOF
+AUTOLOGINUSER=${USERNAME}
+AUTOLOGINAGAIN=true
+AUTOLOGINDELAY=0
+EOF
+
+elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin
 	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \
diff --git a/scripts/live-helpers b/scripts/live-helpers
index f49eaf7..5e1730b 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -291,14 +291,18 @@ find_files ()
 
 get_mac ()
 {
-   mac=""
-   for adaptor in /sys/class/net/*;do
-      status=$(cat ${adaptor}/iflink)
-      if [ ${status} -eq 2 ];
-      then
-         mac=$(cat ${adaptor}/address)
-         mac=$(echo ${mac}|sed 's/:/-/g'|tr '[a-z]' '[A-Z]')
-      fi
-   done
-   echo $mac
+	mac=""
+
+	for adaptor in /sys/class/net/*
+	do
+		status="$(cat ${adaptor}/iflink)"
+
+		if [ "${status}" -eq 2 ]
+		then
+			mac="$(cat ${adaptor}/address)"
+			mac="$(echo ${mac} | sed 's/:/-/g' | tr '[a-z]' '[A-Z]')"
+		fi
+	done
+
+	echo ${mac}
 }