From: Daniel Baumann <daniel@debian.org>
Date: Sat, 10 Nov 2007 15:18:18 +0000 (+0100)
Subject: Adding files to the live filesystem according to the MAC number, thanks to Jordi... 
X-Git-Tag: debian/2.0.15-1~638
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=c4912ed805864433954e13e3b33b597241e74829;p=live-boot-grml.git

Adding files to the live filesystem according to the MAC number, thanks to Jordi Pujol <jordi_pujol@telefonica.net>.
---

diff --git a/scripts/live b/scripts/live
index 1dcbc74..5867209 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,19 @@ setup_unionfs ()
 			done
 		done
 
+    if [ -n "${addimage_directory}" -a -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
@@ -1262,7 +1278,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