[Lunar-commits] r14634 - lunar-iso/trunk/scripts

[Auke Kok]

Author: sofar
Date: 2005-05-07 14:34:58 +0000 (Sat, 07 May 2005)
New Revision: 14634

Modified:
   lunar-iso/trunk/scripts/initrd
Log:
Incorporating ldd trick code.


Modified: lunar-iso/trunk/scripts/initrd
===================================================================
--- lunar-iso/trunk/scripts/initrd	2005-05-07 14:19:25 UTC (rev 14633)
+++ lunar-iso/trunk/scripts/initrd	2005-05-07 14:34:58 UTC (rev 14634)
@@ -18,18 +18,30 @@
 
 echo "+ copying binaries and required files"
 # next up are the required stuff from the BUILD
-cat initrd.list initrd.list-$ISO_KSUFFIX | while read ITEM DIR; do
-	if [ -n "$DIR" ]; then
-		mkdir -p BUILD/$DIR
-		cp -a --no-dereference "$ISO_TARGET/$ITEM" "BUILD/$DIR"
-	else
-	    mkdir -p "BUILD/$(dirname $ITEM)"
-    	cp -a --no-dereference "$ISO_TARGET/$ITEM" "BUILD/$(dirname $ITEM)"
-	fi
-done
-echo "+ filling /dev"
+transfer()
+{
+	while read ITEM DIR; do
+		if [ -n "$DIR" ]; then
+			mkdir -p BUILD/$DIR
+			cp --no-dereference "$ISO_TARGET/$ITEM" "$ISO_SOURCE/initrd/BUILD/$DIR"
+		else
+	    	mkdir -p "$ISO_SOURCE/initrd/BUILD/$(dirname $ITEM)"
+	    	cp --no-dereference "$ISO_TARGET/$ITEM" "$ISO_SOURCE/initrd/BUILD/$(dirname $ITEM)"
+		fi
+	done
+}
 
+(
+	cd $ISO_TARGET
+	cat $ISO_SOURCE/initrd/initrd.list | transfer
+	cat $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | tranfer
+	$ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list | transfer
+	$ISO_SOURCE/scripts/ldd-gather $ISO_SOURCE/initrd/initrd.list-$ISO_KSUFFIX | transfer
+)
+
+
 # bare minimum of device nodes
+echo "+ filling /dev"
 mkdir -p BUILD/dev
 
 if [ "${ISO_KSUFFIX}" = "2.4" ]; then