From 2245ce78f89727826f77e7bbb3bf9fcfb8210adf Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 3 Sep 2008 12:38:08 +0000
Subject: [PATCH] Image names are now vendor-neutral

---
 targets/Linux-arm | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/targets/Linux-arm b/targets/Linux-arm
index 7caa7f6..60d4200 100644
--- a/targets/Linux-arm
+++ b/targets/Linux-arm
@@ -34,7 +34,7 @@ _create_directories()
 #public
 target_image()
 {
-	_create_directories 'bin' 'dev' 'etc' 'lib'
+	_create_directories 'bin' 'dev' 'etc' 'lib' 'sbin'
 
 	echo
 	echo -n "Fixing installation paths:"
@@ -55,24 +55,39 @@ target_image()
 	if [ ! -z "$KERNEL_MODULES" ]; then
 		echo
 		echo "Installing kernel modules:"
-		gunzip -c < "$KERNEL_MODULES" | (cd "$DESTDIR" && $TAR -xf -) \
-								|| exit 2
+		#progress -ef "$KERNEL_MODULES" -- gunzip -c \
+		gunzip -c "$KERNEL_MODULES" \
+				| (cd "$DESTDIR" && $TAR -xf -)	|| exit 2
+	fi
+
+	if [ ! -x "$DESTDIR/sbin/init" ]; then
+		echo
+		echo -n "Installing init:"
+		cat > "$DESTDIR/sbin/init" << EOF
+#!/bin/sh
+
+echo "init called with arguments: \$@"
+echo "Falling back to interactive mode:"
+/bin/sh
+EOF
+		chmod a+rx "$DESTDIR/sbin/init"
+		echo
 	fi
 
 	echo
 	echo "Building rootfs image:"
-	$MKFS DeforaOS-rootfs.jffs2				|| exit 2
-	$DU DeforaOS-rootfs.jffs2
+	$MKFS "$IMAGE_IMAGE"				|| exit 2
+	$DU "$IMAGE_IMAGE"
 
 	echo
 	echo "Building tarball:"
 	OLDPWD="$PWD"
-	(cd "$DESTDIR" && $TAR -cvzf "$OLDPWD/DeforaOS-rootfs.tar.gz" .) \
+	(cd "$DESTDIR" && $TAR -cvzf "$OLDPWD/$IMAGE_IMAGE.tar.gz" .) \
 	| while read filename; do
 		echo -en "\r$filename"
 	done || (echo && exit 2)
 	echo -en "\r"
-	$DU DeforaOS-rootfs.tar.gz
+	$DU "$IMAGE_IMAGE.tar.gz"
 }